diff --git a/Cargo.lock b/Cargo.lock index 74460b9..971ace3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,11 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - [[package]] name = "ahash" version = "0.4.5" @@ -88,9 +82,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "clap" -version = "3.0.0-beta.1" +version = "3.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "860643c53f980f0d38a5e25dfab6c3c93b2cb3aa1fe192643d17a293c6c41936" +checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142" dependencies = [ "atty", "bitflags", @@ -107,9 +101,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.0.0-beta.1" +version = "3.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb51c9e75b94452505acd21d929323f5a5c6c4735a852adbd39ef5fb1b014f30" +checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1" dependencies = [ "heck", "proc-macro-error", @@ -167,22 +161,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "hashbrown" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29fba9abe4742d586dfd0c06ae4f7e73a1c2d86b856933509b269d82cdf06e18" - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "ahash 0.3.8", - "autocfg", -] - [[package]] name = "hashbrown" version = "0.9.0" @@ -200,20 +178,20 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" dependencies = [ "libc", ] [[package]] name = "hfs_nfd" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b330a52e44b5243043c763a1bc32ed009825aa620a2adebe9ed8192f872582a0" +checksum = "cc4ab9c60b03b98d92ead6745c4db73a754e0f94341954b254301aeaab6525bf" dependencies = [ - "hashbrown 0.3.1", + "ahash", "lazy_static", "thiserror", ] @@ -225,7 +203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" dependencies = [ "autocfg", - "hashbrown 0.9.0", + "hashbrown", ] [[package]] @@ -259,7 +237,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a846c4945fff1fed26015d882a6a782b70fd320c7c735e0754701c5bc0bf6aa5" dependencies = [ - "ahash 0.4.5", + "ahash", "lazy_static", "regex", ] @@ -310,11 +288,11 @@ dependencies = [ [[package]] name = "oem_cp" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a800a76221f3b44697a4a37cae04e330ab1a2e032ef03fd40f60bfa540b2d6e9" +checksum = "7d450410142064c73ff7817d5613b236d55bc66b282a2015add6b7774af7d334" dependencies = [ - "hashbrown 0.8.2", + "ahash", "lazy_static", ] @@ -326,9 +304,9 @@ checksum = "2ac6fe3538f701e339953a3ebbe4f39941aababa8a3f6964635b24ab526daeac" [[package]] name = "proc-macro-error" -version = "0.4.12" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", @@ -339,14 +317,12 @@ dependencies = [ [[package]] name = "proc-macro-error-attr" -version = "0.4.12" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "syn", - "syn-mid", "version_check", ] @@ -409,17 +385,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "syn-mid" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "termcolor" version = "1.1.0" @@ -431,9 +396,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789" dependencies = [ "unicode-width", ] @@ -536,7 +501,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "zifu" -version = "0.2.0" +version = "0.2.1" dependencies = [ "ansi_term", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index fe49b32..81e4f42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zifu" -version = "0.2.0" +version = "0.2.1" authors = ["Tatsunori Uchino "] edition = "2018" license = "MIT" diff --git a/README.md b/README.md index 6382638..7b67950 100644 --- a/README.md +++ b/README.md @@ -110,8 +110,7 @@ If you prefer UTF-8 than the encoding of your language, add `-u` option. This i - トルコ語など / Turkish etc. (CP857) - ヘブライ語 / Hebrew (CP862) - ロシア語など / Russian etc. (CP866) - -アラビア文字を利用する言語 (CP720) は未対応です。 / Languages using Arabic letters (CP720) has not yet been supported. +- アラビア語 / Arabic (CP720) 非対応の言語では、CP437が使用されます。 / CP437 will be used in unsupported languages. diff --git a/src/main.rs b/src/main.rs index 56b5db1..5f12759 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,35 +27,35 @@ fn main() -> anyhow::Result<()> { .version(crate_version!()) .about(crate_description!()) .arg( - Arg::with_name("input") + Arg::new("input") .about("Path to the ZIP file where you want to change the encoding of the file name to UTF-8") .required(true) ) .arg( - Arg::with_name("output") + Arg::new("output") .about("Path to output") ) .arg( - Arg::with_name("check") + Arg::new("check") .long("check") .short('c') .about("Finds out if its file names are encoded in UTF-8.") ) .arg( - Arg::with_name("list") + Arg::new("list") .short('l') .long("list") .about("Displays the list of file names in the ZIP archive.") ) .arg( - Arg::with_name("encoding") + Arg::new("encoding") .long("encoding") .short('e') .value_name("ENCODING") .about("Specifies the encoding of file names in the ZIP archive.") ) .arg( - Arg::with_name("utf-8") + Arg::new("utf-8") .long("utf8") .short('u') .about("Treats the encoding of the ZIP archive as UTF-8 first. (Default: try legacy encoding first)")