diff --git a/Cargo.lock b/Cargo.lock
index 4393136..79c7bea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,15 +37,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.53"
@@ -54,9 +45,9 @@ checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
 [[package]]
 name = "assert_fs"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633ff1df0788db09e2087fb93d05974e93acb886ac3aec4e67be1d6932e360e4"
+checksum = "cf09bb72e00da477c2596865e8873227e2196d263cca35414048875dbbeea1be"
 dependencies = [
  "doc-comment",
  "globwalk",
@@ -85,9 +76,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
  "addr2line",
  "cc",
@@ -118,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.8.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "bytes"
@@ -155,13 +146,9 @@ version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
- "ansi_term",
- "atty",
  "bitflags",
- "strsim 0.8.0",
  "textwrap 0.11.0",
  "unicode-width",
- "vec_map",
 ]
 
 [[package]]
@@ -183,19 +170,9 @@ dependencies = [
 
 [[package]]
 name = "clap-verbosity-flag"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82234dd749fbce1abf053e6b51a57fabec14a88a46ee65c20ad3220931d054c3"
-dependencies = [
- "log",
- "structopt",
-]
-
-[[package]]
-name = "clap-verbosity-flag"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1281ab1a7abc0f415a57cf6bc1f46282957ce0c5f2b3fe6b98ff3adf8e29b3"
+checksum = "c2474445ef3370e4844f9082eef2f80e4abaf7d985781afd78b89b58e2f69a14"
 dependencies = [
  "clap 3.0.13",
  "log",
@@ -203,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0"
+version = "3.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b9752c030a14235a0bd5ef3ad60a1dcac8468c30921327fc8af36b20c790b9"
+checksum = "0fd2078197a22f338bd4fbf7d6387eb6f0d6a3c69e6cbc09f5c93e97321fd92a"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -216,24 +193,24 @@ dependencies = [
 
 [[package]]
 name = "codegenrs"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ddd502dcea683adf4f900cbfe9e7ed6e658bb229ae903e2e20f070a99f19353"
+checksum = "d7ecb55fae620b95dc3586f10bf6d93d4bfc73b34b0adddf18445b9291458dd6"
 dependencies = [
+ "clap 3.0.13",
  "derive_more",
  "difference",
  "normalize-line-endings",
- "structopt",
 ]
 
 [[package]]
 name = "codespell-codegen"
 version = "0.4.0"
 dependencies = [
+ "clap 3.0.13",
  "codegenrs",
  "dictgen",
  "itertools",
- "structopt",
  "unicase",
 ]
 
@@ -268,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "concolor-clap"
-version = "0.0.8"
+version = "0.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059a1172876f3c1a3a23247d9d79efaaaf2f27f40a776e54db820be8386be32a"
+checksum = "0efdfa40e7f50b7ac8b2e336fad01c7071b9ab935b9082174cdb4e9fd5f6dc38"
 dependencies = [
  "clap 3.0.13",
  "concolor",
@@ -352,9 +329,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -373,9 +350,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -386,9 +363,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
 dependencies = [
  "cfg-if",
  "lazy_static",
@@ -613,6 +590,15 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -621,9 +607,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if",
  "libc",
@@ -680,12 +666,9 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -753,14 +736,23 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.3"
@@ -784,9 +776,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
 name = "js-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -808,9 +800,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
 
 [[package]]
 name = "log"
@@ -862,11 +854,11 @@ dependencies = [
 name = "misspell-codegen"
 version = "0.4.0"
 dependencies = [
+ "clap 3.0.13",
  "codegenrs",
  "dictgen",
  "itertools",
  "regex",
- "structopt",
  "unicase",
 ]
 
@@ -907,9 +899,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -957,9 +949,9 @@ dependencies = [
 
 [[package]]
 name = "os_type"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96eaebe22d9f12429b1af6a0b5dd411ccfc5cb5968710abbb8c512046be9df90"
+checksum = "c3df761f6470298359f84fcfb60d86db02acc22c251c37265c07a3d1057d2389"
 dependencies = [
  "regex",
 ]
@@ -1033,15 +1025,15 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "predicates"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715"
+checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
 dependencies = [
  "difflib",
  "itertools",
@@ -1050,15 +1042,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
+checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7"
+checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -1096,18 +1088,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.34"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
@@ -1315,15 +1307,9 @@ checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559"
 
 [[package]]
 name = "siphasher"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e"
 
 [[package]]
 name = "strsim"
@@ -1337,35 +1323,11 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "structopt"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
-dependencies = [
- "clap 2.34.0",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "syn"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1374,13 +1336,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
  "cfg-if",
+ "fastrand",
  "libc",
- "rand",
  "redox_syscall",
  "remove_dir_all",
  "winapi",
@@ -1397,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "termtree"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
+checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
 
 [[package]]
 name = "textwrap"
@@ -1438,9 +1400,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
@@ -1546,7 +1508,7 @@ dependencies = [
  "atty",
  "bstr",
  "clap 3.0.13",
- "clap-verbosity-flag 0.4.0",
+ "clap-verbosity-flag",
  "concolor",
  "concolor-clap",
  "content_inspector",
@@ -1591,11 +1553,11 @@ dependencies = [
 name = "typos-dict-codegen"
 version = "1.3.0"
 dependencies = [
+ "clap 3.0.13",
  "codegenrs",
  "csv",
  "dictgen",
  "itertools",
- "structopt",
  "unicase",
 ]
 
@@ -1603,11 +1565,11 @@ dependencies = [
 name = "typos-dict-verify"
 version = "1.3.0"
 dependencies = [
+ "clap 3.0.13",
  "codegenrs",
  "csv",
  "edit-distance",
  "itertools",
- "structopt",
  "unicase",
  "varcon",
 ]
@@ -1627,13 +1589,12 @@ name = "typos-vars-codegen"
 version = "1.3.0"
 dependencies = [
  "clap 3.0.13",
- "clap-verbosity-flag 0.3.2",
+ "clap-verbosity-flag",
  "codegenrs",
  "dictgen",
  "env_logger",
  "itertools",
  "log",
- "structopt",
  "typos",
  "unicase",
  "varcon",
@@ -1687,8 +1648,8 @@ dependencies = [
 name = "varcon-codegen"
 version = "1.3.0"
 dependencies = [
+ "clap 3.0.13",
  "codegenrs",
- "structopt",
  "varcon-core",
 ]
 
@@ -1700,17 +1661,11 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "wait-timeout"
@@ -1740,9 +1695,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1750,9 +1705,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -1765,9 +1720,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1775,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1788,15 +1743,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "web-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1806,10 +1761,10 @@ dependencies = [
 name = "wikipedia-codegen"
 version = "0.4.0"
 dependencies = [
+ "clap 3.0.13",
  "codegenrs",
  "dictgen",
  "itertools",
- "structopt",
  "unicase",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 61b585f..6f42a4b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,7 +74,7 @@ env_logger = { version = "0.9", default-features = false, features = ["termcolor
 atty = "0.2.14"
 yansi = "0.5.0"
 concolor = { version = "0.0.8" }
-concolor-clap = { version = "0.0.8", features = ["api_unstable"] }
+concolor-clap = { version = "0.0.9", features = ["api_unstable"] }
 bstr = "0.2"
 once_cell = "1.2.0"
 ahash = "0.7"
diff --git a/crates/codespell-dict/codegen/Cargo.toml b/crates/codespell-dict/codegen/Cargo.toml
index b531fec..3f45c28 100644
--- a/crates/codespell-dict/codegen/Cargo.toml
+++ b/crates/codespell-dict/codegen/Cargo.toml
@@ -16,6 +16,6 @@ release = false
 [dependencies]
 unicase = "2.5"
 itertools = "0.10"
-codegenrs = "1.0"
-structopt = "0.3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
 dictgen = { version = "^0.2", path = "../../dictgen", features = ["codegen"] }
diff --git a/crates/codespell-dict/codegen/src/main.rs b/crates/codespell-dict/codegen/src/main.rs
index 3418231..f5046d8 100644
--- a/crates/codespell-dict/codegen/src/main.rs
+++ b/crates/codespell-dict/codegen/src/main.rs
@@ -1,4 +1,4 @@
-use structopt::StructOpt;
+use clap::Parser;
 
 pub const DICT: &str = include_str!("../../assets/dictionary.txt");
 
@@ -43,17 +43,16 @@ fn generate<W: std::io::Write>(file: &mut W) {
     .unwrap();
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     rustmft: codegenrs::RustfmtArgs,
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let options = Options::from_args();
+    let options = Options::parse();
 
     let mut content = vec![];
     generate(&mut content);
diff --git a/crates/misspell-dict/codegen/Cargo.toml b/crates/misspell-dict/codegen/Cargo.toml
index f8cd071..b6c6ae9 100644
--- a/crates/misspell-dict/codegen/Cargo.toml
+++ b/crates/misspell-dict/codegen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 [dependencies]
 unicase = "2.5"
 itertools = "0.10"
-codegenrs = "1.0"
-structopt = "0.3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
 regex = "1"
 dictgen = { version = "^0.2", path = "../../dictgen", features = ["codegen"] }
diff --git a/crates/misspell-dict/codegen/src/main.rs b/crates/misspell-dict/codegen/src/main.rs
index ad2645c..d0126ed 100644
--- a/crates/misspell-dict/codegen/src/main.rs
+++ b/crates/misspell-dict/codegen/src/main.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use structopt::StructOpt;
+use clap::Parser;
 
 pub const DICT: &str = include_str!("../../assets/words.go");
 
@@ -97,17 +97,16 @@ fn generate<W: std::io::Write>(file: &mut W) {
     .unwrap();
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     rustmft: codegenrs::RustfmtArgs,
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let options = Options::from_args();
+    let options = Options::parse();
 
     let mut content = vec![];
     generate(&mut content);
diff --git a/crates/typos-dict/codegen/Cargo.toml b/crates/typos-dict/codegen/Cargo.toml
index ee75f88..25340a6 100644
--- a/crates/typos-dict/codegen/Cargo.toml
+++ b/crates/typos-dict/codegen/Cargo.toml
@@ -17,6 +17,6 @@ release = false
 csv = "1.1"
 itertools = "0.10"
 unicase = "2.5"
-codegenrs = "1.0"
-structopt = "0.3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
 dictgen = { version = "^0.2", path = "../../dictgen", features = ["codegen"] }
diff --git a/crates/typos-dict/codegen/src/main.rs b/crates/typos-dict/codegen/src/main.rs
index 8cead1f..d77cbfe 100644
--- a/crates/typos-dict/codegen/src/main.rs
+++ b/crates/typos-dict/codegen/src/main.rs
@@ -1,4 +1,4 @@
-use structopt::StructOpt;
+use clap::Parser;
 
 const DICT: &[u8] = include_bytes!("../../assets/words.csv");
 
@@ -37,17 +37,16 @@ fn generate<W: std::io::Write>(file: &mut W) {
     .unwrap();
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     rustmft: codegenrs::RustfmtArgs,
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let options = Options::from_args();
+    let options = Options::parse();
 
     let mut content = vec![];
     generate(&mut content);
diff --git a/crates/typos-dict/verify/Cargo.toml b/crates/typos-dict/verify/Cargo.toml
index 8f4d58c..65c918c 100644
--- a/crates/typos-dict/verify/Cargo.toml
+++ b/crates/typos-dict/verify/Cargo.toml
@@ -16,8 +16,8 @@ release = false
 [dependencies]
 csv = "1.1"
 unicase = "2.5"
-codegenrs = "1.0"
-structopt = "0.3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
 varcon = { version = "^0.6", path = "../../varcon" }
 itertools = "0.10"
 edit-distance = "2.1"
diff --git a/crates/typos-dict/verify/src/main.rs b/crates/typos-dict/verify/src/main.rs
index 0a565a3..884baba 100644
--- a/crates/typos-dict/verify/src/main.rs
+++ b/crates/typos-dict/verify/src/main.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use std::collections::HashSet;
 use unicase::UniCase;
 
-use structopt::StructOpt;
+use clap::Parser;
 
 type Dict = BTreeMap<UniCase<String>, Vec<String>>;
 
@@ -128,17 +128,16 @@ fn find_best_match<'c>(
     matches.into_iter().next().map(|(_, r)| r)
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(short("-i"), long, parse(from_os_str))]
+    #[clap(short('i'), long, parse(from_os_str))]
     input: std::path::PathBuf,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let options = Options::from_args();
+    let options = Options::parse();
 
     let data = std::fs::read(&options.input).unwrap();
 
diff --git a/crates/typos-vars/codegen/Cargo.toml b/crates/typos-vars/codegen/Cargo.toml
index 7699169..82e41b4 100644
--- a/crates/typos-vars/codegen/Cargo.toml
+++ b/crates/typos-vars/codegen/Cargo.toml
@@ -18,11 +18,10 @@ varcon = { version = "^0.6", path = "../../varcon", features = ["flags"] }
 varcon-core = { version = "^2.0", path = "../../varcon-core", features = ["flags"] }
 typos = { version = "^0.8", path = "../../typos" }
 unicase = "2.5"
-codegenrs = "1.0"
-structopt = "0.3"
-clap = "3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
+clap-verbosity-flag = "0.4"
 log = "0.4"
 env_logger = "0.9"
-clap-verbosity-flag = "0.3"
 itertools = "0.10"
 dictgen = { version = "^0.2", path = "../../dictgen", features = ["codegen"] }
diff --git a/crates/typos-vars/codegen/src/main.rs b/crates/typos-vars/codegen/src/main.rs
index 30174e3..6242e20 100644
--- a/crates/typos-vars/codegen/src/main.rs
+++ b/crates/typos-vars/codegen/src/main.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 use std::collections::HashSet;
 use std::io::Write;
 
-use structopt::StructOpt;
+use clap::Parser;
 
 static CATEGORIES: [varcon::Category; 4] = [
     varcon::Category::American,
@@ -273,15 +273,14 @@ fn ignore_variant(variant: &varcon_core::Variant) -> bool {
 // varcon needs
 // all entries by name
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     rustmft: codegenrs::RustfmtArgs,
 
-    #[structopt(flatten)]
+    #[clap(flatten)]
     pub(crate) verbose: clap_verbosity_flag::Verbosity,
 }
 
@@ -309,7 +308,7 @@ fn init_logging(level: Option<log::Level>) {
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let mut options = Options::from_args();
+    let mut options = Options::parse();
     options.verbose.set_default(Some(log::Level::Info));
     init_logging(options.verbose.log_level());
 
diff --git a/crates/varcon/codegen/Cargo.toml b/crates/varcon/codegen/Cargo.toml
index f7ba0ed..a25ceb7 100644
--- a/crates/varcon/codegen/Cargo.toml
+++ b/crates/varcon/codegen/Cargo.toml
@@ -14,6 +14,6 @@ publish = false
 release = false
 
 [dependencies]
-codegenrs = "1.0"
-structopt = "0.3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
 varcon-core = { version = "^2.0", path = "../../varcon-core", features = ["parser"] }
diff --git a/crates/varcon/codegen/src/main.rs b/crates/varcon/codegen/src/main.rs
index cd19935..596a17e 100644
--- a/crates/varcon/codegen/src/main.rs
+++ b/crates/varcon/codegen/src/main.rs
@@ -1,4 +1,4 @@
-use structopt::StructOpt;
+use clap::Parser;
 
 const DICT: &[u8] = include_bytes!("../../assets/varcon.txt");
 
@@ -71,17 +71,16 @@ fn generate<W: std::io::Write>(file: &mut W) {
     writeln!(file, "];").unwrap();
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     rustmft: codegenrs::RustfmtArgs,
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let options = Options::from_args();
+    let options = Options::parse();
 
     let mut content = vec![];
     generate(&mut content);
diff --git a/crates/wikipedia-dict/codegen/Cargo.toml b/crates/wikipedia-dict/codegen/Cargo.toml
index 1eea5d8..bde0d8c 100644
--- a/crates/wikipedia-dict/codegen/Cargo.toml
+++ b/crates/wikipedia-dict/codegen/Cargo.toml
@@ -16,6 +16,6 @@ release = false
 [dependencies]
 unicase = "2.5"
 itertools = "0.10"
-codegenrs = "1.0"
-structopt = "0.3"
+codegenrs = "2.0"
+clap = { version = "3.0", features = ["derive"] }
 dictgen = { version = "^0.2", path = "../../dictgen", features = ["codegen"] }
diff --git a/crates/wikipedia-dict/codegen/src/main.rs b/crates/wikipedia-dict/codegen/src/main.rs
index 3418231..f5046d8 100644
--- a/crates/wikipedia-dict/codegen/src/main.rs
+++ b/crates/wikipedia-dict/codegen/src/main.rs
@@ -1,4 +1,4 @@
-use structopt::StructOpt;
+use clap::Parser;
 
 pub const DICT: &str = include_str!("../../assets/dictionary.txt");
 
@@ -43,17 +43,16 @@ fn generate<W: std::io::Write>(file: &mut W) {
     .unwrap();
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[derive(Debug, Parser)]
 struct Options {
-    #[structopt(flatten)]
+    #[clap(flatten)]
     codegen: codegenrs::CodeGenArgs,
-    #[structopt(flatten)]
+    #[clap(flatten)]
     rustmft: codegenrs::RustfmtArgs,
 }
 
 fn run() -> Result<i32, Box<dyn std::error::Error>> {
-    let options = Options::from_args();
+    let options = Options::parse();
 
     let mut content = vec![];
     generate(&mut content);