diff --git a/Cargo.lock b/Cargo.lock index a4dc5aea0..fe5d68cbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,24 +19,33 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" [[package]] name = "aquamarine" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e14cb2a51c8b45d26a4219981985c7350fc05eacb7b5b2939bceb2ffefdf3e" +checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f" dependencies = [ "itertools 0.9.0", "proc-macro-error", @@ -47,9 +56,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.8" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" +checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e" dependencies = [ "bstr", "doc-comment", @@ -268,9 +277,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", @@ -289,25 +298,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "bstr" version = "0.2.17" @@ -320,16 +317,10 @@ dependencies = [ ] [[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.4.3" +name = "bumpalo" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" [[package]] name = "cc" @@ -354,22 +345,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", "num-traits", "time", + "wasm-bindgen", "winapi", ] [[package]] name = "clang-sys" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" +checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" dependencies = [ "glob", "libc", @@ -378,15 +371,15 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.9" +version = "3.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aad2534fad53df1cc12519c5cda696dd3e20e6118a027e24054aea14a0bdcbe" +checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" dependencies = [ "atty", "bitflags", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "textwrap", @@ -394,18 +387,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "3.1.1" +version = "3.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25" +checksum = "e4179da71abd56c26b54dd0c248cc081c1f43b0a1a7e8448e28e57a29baa993d" dependencies = [ "clap", ] [[package]] name = "clap_lex" -version = "0.1.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189ddd3b5d32a70b35e7686054371742a937b0d99128e76dde6340210e966669" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] @@ -420,11 +413,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if", "crossbeam-utils", @@ -432,9 +440,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -443,33 +451,43 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" dependencies = [ "cfg-if", - "lazy_static", + "once_cell", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", ] [[package]] name = "cxx" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e599641dff337570f6aa9c304ecca92341d30bf72e1c50287869ed6a36615a6" +checksum = "8b7df2292959b7e22a5cb39d37b7e72b2c748b12f956cc409b529fddcdc8857b" dependencies = [ "cc", "cxxbridge-flags", @@ -479,9 +497,9 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.68" +version = "0.7.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2c726d93799c3129c65224ab09eae1a31276bc593d4f7344be1c592c16a1ec" +checksum = "c554bfd9f90f935b602d345b31cd35e82192d7415dac9c78efbaddc6b5c36823" dependencies = [ "codespan-reporting", "proc-macro2", @@ -491,15 +509,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3894ad0c6d517cb5a4ce8ec20b37cd0ea31b480fe582a104c5db67ae21270853" +checksum = "d2069b1573efd6e5901004e8fdca2e28bc6f47f86dc24da81182851e71cf3208" [[package]] name = "cxxbridge-macro" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fa7e395dc1c001083c7eed28c8f0f0b5a225610f3b6284675f444af6fab86b" +checksum = "d980827d1ec28ea6e0db545fceaa611eb8e43f70eff8c1c33cc2c96ffa0f0476" dependencies = [ "proc-macro2", "quote", @@ -514,11 +532,12 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.8.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "generic-array", + "block-buffer", + "crypto-common", ] [[package]] @@ -529,9 +548,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "env_logger" @@ -546,17 +565,11 @@ dependencies = [ "termcolor", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fastrand" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" dependencies = [ "instant", ] @@ -584,18 +597,19 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", + "version_check", ] [[package]] name = "gimli" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" [[package]] name = "glob" @@ -605,23 +619,23 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "handlebars" -version = "4.2.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" +checksum = "360d9740069b2f6cbb63ce2dbaa71a20d3185350cbb990d7bebeb9318415eb17" dependencies = [ "log", "pest", "pest_derive", - "quick-error", "serde", "serde_json", + "thiserror", ] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" @@ -644,11 +658,25 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "iana-time-zone" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "js-sys", + "once_cell", + "wasm-bindgen", + "winapi", +] + [[package]] name = "indexmap" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", @@ -657,12 +685,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7906a9fababaeacb774f72410e497a1d18de916322e33797bb2cd29baa23c9e" -dependencies = [ - "unindent", -] +checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" [[package]] name = "instant" @@ -699,9 +724,18 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" + +[[package]] +name = "js-sys" +version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +dependencies = [ + "wasm-bindgen", +] [[package]] name = "lazy_static" @@ -717,9 +751,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.123" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "libloading" @@ -733,28 +767,22 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" dependencies = [ "cc", ] [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "mdbook" version = "0.4.21" @@ -783,9 +811,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -798,9 +826,9 @@ dependencies = [ [[package]] name = "miette" -version = "4.4.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a097de91d72c13382f60213ed9f7f7a26afd8bee0ea320b47f886a9a67ca5a1" +checksum = "a28d6092d7e94a90bb9ea8e6c26c99d5d112d49dda2afdb4f7ea8cf09e1a5a6d" dependencies = [ "atty", "backtrace", @@ -818,9 +846,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "4.4.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a95a48d0bc28f9af628286e8a4da09f96f34a97744a2e9a5a4db9814ad527d" +checksum = "4f2485ed7d1fe80704928e3eb86387439609bd0c6bb96db8208daa364cfd1e09" dependencies = [ "proc-macro2", "quote", @@ -835,19 +863,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" dependencies = [ "adler", - "autocfg", ] [[package]] name = "moveit" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "815d5988a1dd22f08bad572a83ee654563bb422ece5d5bce41f31ec49399dcb5" +checksum = "d7d756ffe4e38013507d35bf726a93fcdae2cae043ab5ce477f13857a335030d" dependencies = [ "cxx", ] @@ -864,9 +891,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -874,9 +901,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -893,24 +920,18 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" - -[[package]] -name = "opaque-debug" -version = "0.2.3" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" [[package]] name = "opener" @@ -924,15 +945,15 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" [[package]] name = "owo-colors" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e72e30578e0d0993c8ae20823dd9cff2bc5517d2f586a8aef462a581e8a03eb" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pathdiff" @@ -948,18 +969,19 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pest" -version = "2.1.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4" dependencies = [ + "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +checksum = "905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91" dependencies = [ "pest", "pest_generator", @@ -967,9 +989,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.1.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad" dependencies = [ "pest", "pest_meta", @@ -980,11 +1002,11 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.1.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04" dependencies = [ - "maplit", + "once_cell", "pest", "sha-1", ] @@ -1018,9 +1040,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.15" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1516508b396cefe095485fdce673007422f5e48e82934b7b423dc26aa5e6a4" +checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a" dependencies = [ "proc-macro2", "syn", @@ -1052,44 +1074,38 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "pulldown-cmark" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" +checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ "bitflags", "memchr", "unicase", ] -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quote" -version = "1.0.18" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ "autocfg", "crossbeam-deque", @@ -1099,9 +1115,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1111,18 +1127,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -1137,9 +1153,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "remove_dir_all" @@ -1170,15 +1186,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "scopeguard" @@ -1188,18 +1204,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.136" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2", "quote", @@ -1208,9 +1224,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -1219,14 +1235,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.8.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "block-buffer", + "cfg-if", + "cpufeatures", "digest", - "fake-simd", - "opaque-debug", ] [[package]] @@ -1249,9 +1264,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum_macros" -version = "0.24.0" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", "proc-macro2", @@ -1290,13 +1305,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.91" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1340,9 +1355,9 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" [[package]] name = "test-log" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4235dbf7ea878b3ef12dea20a59c134b405a66aafc4fc2c7b9935916e289e735" +checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e" dependencies = [ "proc-macro2", "quote", @@ -1362,18 +1377,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" dependencies = [ "proc-macro2", "quote", @@ -1408,9 +1423,9 @@ checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" [[package]] name = "trybuild" -version = "1.0.59" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606ab3fe0065741fdbb51f64bcb6ba76f13fad49f1723030041826c631782764" +checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" dependencies = [ "glob", "once_cell", @@ -1429,9 +1444,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicase" @@ -1442,6 +1457,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-ident" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" + [[package]] name = "unicode-linebreak" version = "0.1.2" @@ -1457,18 +1478,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unindent" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514672a55d7380da379785a4d70ca8386c8883ff7eaae877be4d2081cebe73d8" - [[package]] name = "version_check" version = "0.9.4" @@ -1490,15 +1499,69 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasm-bindgen" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" + [[package]] name = "which" -version = "4.2.5" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] diff --git a/book/src/tutorial.md b/book/src/tutorial.md index 317ade348..752967eca 100644 --- a/book/src/tutorial.md +++ b/book/src/tutorial.md @@ -26,7 +26,7 @@ cxx = "1.0" [build-dependencies] autocxx-build = "0.22.4" -miette = { version="4.3", features=["fancy"] } # optional but gives nicer error messages! +miette = { version = "5", features = ["fancy"] } # optional but gives nicer error messages! ``` Now, add a `build.rs` next to your `Cargo.toml` (this is a standard `cargo` [build script](https://doc.rust-lang.org/cargo/reference/build-scripts.html)). This is where you need your include path: diff --git a/demo/Cargo.toml b/demo/Cargo.toml index f6c24317a..e411a8745 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "..", version="0.22.4" } +autocxx = { path = "..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../gen/build", version="0.22.4" } -miette = { version="4.3", features=["fancy"]} +autocxx-build = { path = "../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 326d62d7b..7ff0d8d8c 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -18,12 +18,12 @@ keywords = ["ffi"] categories = ["development-tools::ffi", "api-bindings"] [features] -default = [ "reproduction_case" ] +default = ["reproduction_case"] build = ["cc"] -nightly = [] # for doc generation purposes only; used by docs.rs -reproduction_case = [ "serde_json", "autocxx-parser/reproduction_case" ] -runtime = [ "autocxx-bindgen/runtime" ] -static = [ "autocxx-bindgen/static" ] +nightly = [] # for doc generation purposes only; used by docs.rs +reproduction_case = ["serde_json", "autocxx-parser/reproduction_case"] +runtime = ["autocxx-bindgen/runtime"] +static = ["autocxx-bindgen/static"] [dependencies] log = "0.4" @@ -38,14 +38,14 @@ cc = { version = "1.0", optional = true } # There can be interdependencies between the code generated by cxx-gen and # what cxx expects to be there. cxx-gen = "0.7.68" -autocxx-parser = { version = "=0.22.4", path="../parser" } +autocxx-parser = { version = "=0.22.4", path = "../parser" } version_check = "0.9" -aquamarine = "0.1" # docs +aquamarine = "0.1" # docs tempfile = "3.1" once_cell = "1.7" strum_macros = "0.24" serde_json = { version = "1.0", optional = true } -miette = "4.3" +miette = "5" thiserror = "1" regex = "1.5" indexmap = "1.8" @@ -53,7 +53,7 @@ prettyplease = { version = "0.1.15", features = ["verbatim"] } [dependencies.syn] version = "1.0.39" -features = [ "full", "printing" ] +features = ["full", "printing"] #features = [ "full", "printing", "extra-traits" ] [package.metadata.docs.rs] diff --git a/examples/chromium-fake-render-frame-host/Cargo.toml b/examples/chromium-fake-render-frame-host/Cargo.toml index da31bb0ca..7b34270e8 100644 --- a/examples/chromium-fake-render-frame-host/Cargo.toml +++ b/examples/chromium-fake-render-frame-host/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features = [ "fancy" ] } +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/llvm/Cargo.toml b/examples/llvm/Cargo.toml index 4c03db74c..7f01c1060 100644 --- a/examples/llvm/Cargo.toml +++ b/examples/llvm/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.17.2" } +autocxx = { path = "../..", version = "0.17.2" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.17.2" } -miette = { version="4.3", features = [ "fancy" ] } +autocxx-build = { path = "../../gen/build", version = "0.17.2" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/non-trivial-type-on-stack/Cargo.toml b/examples/non-trivial-type-on-stack/Cargo.toml index f85f3c654..5bdf56d90 100644 --- a/examples/non-trivial-type-on-stack/Cargo.toml +++ b/examples/non-trivial-type-on-stack/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features = [ "fancy" ] } +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/pod/Cargo.toml b/examples/pod/Cargo.toml index 54980e398..a5b5904ae 100644 --- a/examples/pod/Cargo.toml +++ b/examples/pod/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features = [ "fancy" ] } +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/reference-wrappers/Cargo.toml b/examples/reference-wrappers/Cargo.toml index a35d34ad8..97a79983b 100644 --- a/examples/reference-wrappers/Cargo.toml +++ b/examples/reference-wrappers/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features=["fancy"]} +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/s2/Cargo.toml b/examples/s2/Cargo.toml index 70ead178f..6de12bd0e 100644 --- a/examples/s2/Cargo.toml +++ b/examples/s2/Cargo.toml @@ -16,8 +16,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features = [ "fancy" ] } +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/steam-mini/Cargo.toml b/examples/steam-mini/Cargo.toml index 86ff6cc0d..1ccdfca2e 100644 --- a/examples/steam-mini/Cargo.toml +++ b/examples/steam-mini/Cargo.toml @@ -16,8 +16,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features = [ "fancy" ] } +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] } diff --git a/examples/subclass/Cargo.toml b/examples/subclass/Cargo.toml index 358b83cb3..6a1f2e9c1 100644 --- a/examples/subclass/Cargo.toml +++ b/examples/subclass/Cargo.toml @@ -16,12 +16,12 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } uwuify = "0.2.2" -textwrap = "0.14" +textwrap = "0.15" fastrand = "1.5.0" [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } +autocxx-build = { path = "../../gen/build", version = "0.22.4" } regex = "1.5.4" -miette = { version="4.3", features = [ "fancy" ] } +miette = { version = "5", features = ["fancy"] } diff --git a/gen/build/Cargo.toml b/gen/build/Cargo.toml index 6ac6aed5f..8382fe097 100644 --- a/gen/build/Cargo.toml +++ b/gen/build/Cargo.toml @@ -18,14 +18,16 @@ keywords = ["ffi"] categories = ["development-tools::ffi", "api-bindings"] [features] -runtime = [ "autocxx-engine/runtime" ] -static = [ "autocxx-engine/static" ] +runtime = ["autocxx-engine/runtime"] +static = ["autocxx-engine/static"] [dependencies] -autocxx-engine = { version="=0.22.4", path="../../engine", features = ["build"] } +autocxx-engine = { version = "=0.22.4", path = "../../engine", features = [ + "build", +] } env_logger = "0.9.0" indexmap = "1.8" [dependencies.syn] version = "1.0" -features = [ "full" ] +features = ["full"] diff --git a/gen/cmd/Cargo.toml b/gen/cmd/Cargo.toml index a6e166794..ef0f1c096 100644 --- a/gen/cmd/Cargo.toml +++ b/gen/cmd/Cargo.toml @@ -18,24 +18,24 @@ keywords = ["ffi"] categories = ["development-tools::ffi", "api-bindings"] [features] -runtime = [ "autocxx-engine/runtime" ] -static = [ "autocxx-engine/static" ] +runtime = ["autocxx-engine/runtime"] +static = ["autocxx-engine/static"] [dependencies] -autocxx-engine = { version="=0.22.4", path="../../engine" } +autocxx-engine = { version = "=0.22.4", path = "../../engine" } clap = { version = "3.1.2", features = ["cargo"] } proc-macro2 = "1.0" env_logger = "0.9.0" -miette = { version="4.3", features=["fancy"]} +miette = { version = "5", features = ["fancy"] } pathdiff = "0.2.1" indexmap = "1.8" [dev-dependencies] -assert_cmd = "1.0.3" +assert_cmd = "2" tempfile = "3.1" -autocxx-integration-tests = { path = "../../integration-tests", version="=0.22.4" } # This is necessary for building the projects created # by the trybuild test system... -autocxx = { path="../.." } +autocxx = { path = "../.." } +autocxx-integration-tests = { path = "../../integration-tests", version = "=0.22.4" } cxx = "1.0.68" -itertools = "0.10.3" \ No newline at end of file +itertools = "0.10.3" diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 5209008c5..3b7644ef1 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -27,10 +27,12 @@ rust_info = "0.3.1" cc = "1.0" quote = "1.0" once_cell = "1.7" -autocxx-engine = { version="=0.22.4", path="../engine", features = ["build"] } # This is necessary for building the projects created # by the trybuild test system... -autocxx = { path="..", version="=0.22.4" } +autocxx = { path = "..", version = "=0.22.4" } +autocxx-engine = { version = "=0.22.4", path = "../engine", features = [ + "build", +] } link-cplusplus = "1.0" tempfile = "3.1" indoc = "1.0" @@ -40,7 +42,7 @@ itertools = "0.10" [dependencies.syn] version = "1.0.39" -features = [ "full" ] +features = ["full"] #features = [ "full", "extra-traits" ] [[test]] diff --git a/macro/Cargo.toml b/macro/Cargo.toml index 3d1bf1ead..7ebca1e5d 100644 --- a/macro/Cargo.toml +++ b/macro/Cargo.toml @@ -21,11 +21,11 @@ categories = ["development-tools::ffi", "api-bindings"] proc-macro = true [dependencies] -autocxx-parser = { path="../parser", version="=0.22.4" } +autocxx-parser = { path = "../parser", version = "=0.22.4" } proc-macro-error = "1.0" proc-macro2 = "1.0.11" quote = "1.0" [dependencies.syn] version = "1.0" -features = [ "full" ] +features = ["full"] diff --git a/parser/Cargo.toml b/parser/Cargo.toml index d7ed7892d..ff6f3ce05 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -21,16 +21,16 @@ categories = ["development-tools::ffi", "api-bindings"] log = "0.4" proc-macro2 = "1.0" quote = "1.0" -serde = { version = "1.0", features = [ "derive" ]} +serde = { version = "1.0", features = ["derive"] } thiserror = "1.0" once_cell = "1.10" itertools = "0.10.3" -indexmap = { version="1.8", features = ["serde"]} +indexmap = { version = "1.8", features = ["serde"] } serde_json = "1.0" [dependencies.syn] version = "1.0.39" -features = [ "full", "extra-traits" ] +features = ["full", "extra-traits"] [features] reproduction_case = [] diff --git a/tools/mdbook-preprocessor/Cargo.toml b/tools/mdbook-preprocessor/Cargo.toml index b8c93bc50..51e5be985 100644 --- a/tools/mdbook-preprocessor/Cargo.toml +++ b/tools/mdbook-preprocessor/Cargo.toml @@ -13,23 +13,23 @@ authors = ["adetaylor "] edition = "2021" [dependencies] -clap = { version = "3", features = [ "cargo" ] } +clap = { version = "3", features = ["cargo"] } serde_json = "1" itertools = "0.10" anyhow = "1" regex = "1" -autocxx-integration-tests = { path = "../../integration-tests", version="=0.22.4"} +autocxx-integration-tests = { path = "../../integration-tests", version = "=0.22.4" } rayon = "1.5" gag = "1.0" env_logger = "0.9.0" [dependencies.syn] version = "1.0.39" -features = [ "parsing" ] +features = ["parsing"] [dependencies.proc-macro2] version = "1.0.11" -features = [ "span-locations" ] +features = ["span-locations"] [dependencies.mdbook] version = "0.4" diff --git a/tools/reduce/Cargo.toml b/tools/reduce/Cargo.toml index ea2aed813..09b68c22d 100644 --- a/tools/reduce/Cargo.toml +++ b/tools/reduce/Cargo.toml @@ -15,8 +15,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -autocxx-engine = { version = "=0.22.4", path="../../engine" } -autocxx-parser = { version = "=0.22.4", path="../../parser", features = [ "reproduction_case" ] } +autocxx-engine = { version = "=0.22.4", path = "../../engine" } +autocxx-parser = { version = "=0.22.4", path = "../../parser", features = [ + "reproduction_case", +] } clap = { version = "3.1.2", features = ["cargo"] } tempfile = "3.1" indoc = "1.0" @@ -31,7 +33,7 @@ regex = "1.5" indexmap = "1.8" [dev-dependencies] -assert_cmd = "1.0.3" +assert_cmd = "2" tempfile = "3.1" indoc = "1.0" -proc-macro2 = "1.0" \ No newline at end of file +proc-macro2 = "1.0" diff --git a/tools/stress-test/Cargo.toml b/tools/stress-test/Cargo.toml index 88fe59b82..9549c6b01 100644 --- a/tools/stress-test/Cargo.toml +++ b/tools/stress-test/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dependencies] cxx = "1.0.68" -autocxx = { path = "../..", version="0.22.4" } +autocxx = { path = "../..", version = "0.22.4" } [build-dependencies] -autocxx-build = { path = "../../gen/build", version="0.22.4" } -miette = { version="4.3", features=["fancy"]} +autocxx-build = { path = "../../gen/build", version = "0.22.4" } +miette = { version = "5", features = ["fancy"] }