From 66f71b237bbd2f5a1952d877f547c35c95aa08ee Mon Sep 17 00:00:00 2001 From: David Smith Date: Sat, 13 May 2023 09:17:51 -0400 Subject: [PATCH 1/9] Upgrade clap version --- Cargo.lock | 397 +++++++++++++++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 235 insertions(+), 164 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fec9811485..4deb4f4999 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,6 +88,55 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "approx" version = "0.4.0" @@ -232,12 +281,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" - [[package]] name = "bitmaps" version = "2.1.0" @@ -332,7 +375,7 @@ checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -426,71 +469,52 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "bitflags 1.3.2", - "textwrap 0.11.0", + "bitflags", + "textwrap", "unicode-width", ] [[package]] name = "clap" -version = "3.2.23" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap", - "strsim", - "termcolor", - "textwrap 0.16.0", + "clap_builder", + "clap_derive", + "once_cell", ] [[package]] -name = "clap" -version = "4.1.11" +name = "clap_builder" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ - "bitflags 2.0.2", - "clap_derive", - "clap_lex 0.3.3", - "is-terminal", - "once_cell", + "anstream", + "anstyle", + "bitflags", + "clap_lex", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.1.9" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn 2.0.15", ] [[package]] name = "clap_lex" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "cli_utils" @@ -536,7 +560,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "cocoa-foundation", "core-foundation 0.9.3", @@ -552,7 +576,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "core-foundation 0.9.3", "core-graphics-types", @@ -571,6 +595,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "colored" version = "2.0.0" @@ -699,7 +729,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.7.0", "foreign-types", "libc", @@ -711,7 +741,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "core-graphics-types", "foreign-types", @@ -724,7 +754,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "foreign-types", "libc", @@ -900,7 +930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -924,7 +954,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libloading", "winapi", ] @@ -950,7 +980,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -961,7 +991,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1325,7 +1355,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1462,7 +1492,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gpu-alloc-types", ] @@ -1472,7 +1502,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1481,7 +1511,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gpu-descriptor-types", "hashbrown 0.12.3", ] @@ -1492,7 +1522,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1744,7 +1774,7 @@ source = "git+https://github.com/roc-lang/inkwell?branch=inkwell-llvm-15#95a3a13 dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1915,7 +1945,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa" dependencies = [ - "clap 4.1.11", + "clap 4.2.7", "termcolor", "threadpool", ] @@ -1976,7 +2006,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6f2d7176b94027af58085a2c9d27c4e416586caba409c314569213901d6068" dependencies = [ - "bitflags 1.3.2", + "bitflags", "byteorder", "lazy_static", "libc", @@ -2058,7 +2088,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "core-graphics-types", "foreign-types", @@ -2126,7 +2156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags", "codespan-reporting", "hexf-parse", "indexmap", @@ -2143,7 +2173,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" dependencies = [ - "bitflags 1.3.2", + "bitflags", "jni-sys", "ndk-sys", "num_enum", @@ -2181,7 +2211,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2205,7 +2235,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "cfg-if 1.0.0", "libc", @@ -2218,7 +2248,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "cfg-if 1.0.0", "libc", @@ -2231,7 +2261,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -2243,7 +2273,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if 1.0.0", "libc", "static_assertions", @@ -2322,7 +2352,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2398,12 +2428,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "output_vt100" version = "0.1.3" @@ -2447,7 +2471,7 @@ checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2481,7 +2505,7 @@ dependencies = [ "find-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2595,7 +2619,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2639,7 +2663,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2724,35 +2748,11 @@ dependencies = [ "toml_edit", ] -[[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", - "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", -] - [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -2770,7 +2770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags", "byteorder", "lazy_static", "num-traits", @@ -2790,7 +2790,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags 1.3.2", + "bitflags", "memchr", "unicase", ] @@ -2826,14 +2826,14 @@ checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -2945,7 +2945,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -3230,7 +3230,7 @@ name = "roc_cli" version = "0.0.1" dependencies = [ "bumpalo", - "clap 3.2.23", + "clap 4.2.7", "cli_utils", "const_format", "criterion", @@ -3381,7 +3381,7 @@ dependencies = [ name = "roc_docs_cli" version = "0.0.1" dependencies = [ - "clap 3.2.23", + "clap 4.2.7", "libc", "roc_docs", ] @@ -4025,7 +4025,7 @@ dependencies = [ name = "roc_unify" version = "0.0.1" dependencies = [ - "bitflags 1.3.2", + "bitflags", "roc_collections", "roc_debug_flags", "roc_error_macros", @@ -4040,7 +4040,7 @@ version = "0.0.1" dependencies = [ "bitvec", "bumpalo", - "clap 3.2.23", + "clap 4.2.7", "rand", "roc_wasm_module", ] @@ -4081,7 +4081,7 @@ version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "errno 0.2.8", "io-lifetimes", "libc", @@ -4095,7 +4095,7 @@ version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" dependencies = [ - "bitflags 1.3.2", + "bitflags", "errno 0.3.0", "io-lifetimes", "libc", @@ -4147,7 +4147,7 @@ name = "rustyline" version = "9.1.1" source = "git+https://github.com/roc-lang/rustyline?rev=e74333c#e74333c0d618896b88175bf06645108f996fe6d0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if 1.0.0", "clipboard-win 4.5.0", "dirs-next", @@ -4171,7 +4171,7 @@ version = "0.6.0" source = "git+https://github.com/roc-lang/rustyline?rev=e74333c#e74333c0d618896b88175bf06645108f996fe6d0" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4274,7 +4274,7 @@ checksum = "1ef476a5790f0f6decbc66726b6e5d63680ed518283e64c7df415989d880954f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4334,7 +4334,7 @@ checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4430,7 +4430,7 @@ checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4439,7 +4439,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" dependencies = [ - "bitflags 1.3.2", + "bitflags", "calloop", "dlib", "lazy_static", @@ -4458,7 +4458,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags 1.3.2", + "bitflags", "dlib", "lazy_static", "log", @@ -4500,7 +4500,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4525,7 +4525,7 @@ version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags 1.3.2", + "bitflags", "num-traits", ] @@ -4581,7 +4581,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -4601,6 +4601,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "tap" version = "1.0.1" @@ -4739,7 +4750,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4793,12 +4804,6 @@ dependencies = [ "unicode-width", ] -[[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.39" @@ -4816,7 +4821,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4995,7 +5000,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5184,9 +5189,9 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" @@ -5328,7 +5333,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -5362,7 +5367,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5379,7 +5384,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags 1.3.2", + "bitflags", "downcast-rs", "libc", "nix 0.24.3", @@ -5418,7 +5423,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags 1.3.2", + "bitflags", "wayland-client", "wayland-commons", "wayland-scanner", @@ -5503,7 +5508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d" dependencies = [ "arrayvec 0.7.2", - "bitflags 1.3.2", + "bitflags", "cfg_aliases", "codespan-reporting", "copyless", @@ -5528,7 +5533,7 @@ dependencies = [ "arrayvec 0.7.2", "ash", "bit-set", - "bitflags 1.3.2", + "bitflags", "block", "core-graphics-types", "d3d12", @@ -5563,7 +5568,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -5624,13 +5629,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" 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.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]] @@ -5639,7 +5644,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -5648,13 +5662,28 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" 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.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-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +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", ] [[package]] @@ -5663,49 +5692,91 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winit" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cocoa", "core-foundation 0.9.3", "core-graphics 0.22.3", diff --git a/Cargo.toml b/Cargo.toml index 6fd759d283..d4a4854892 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,7 +82,7 @@ bumpalo = { version = "3.12.0", features = ["collections"] } bytemuck = { version = "1.13.1", features = ["derive"] } capstone = { version = "0.11.0", default-features = false } cgmath = "0.18.0" -clap = { version = "3.2.23", default-features = false, features = ["std", "color", "suggestions"] } +clap = { version = "4.2.7", default-features = false, features = ["std", "color", "suggestions"] } colored = "2.0.0" confy = { git = 'https://github.com/rust-cli/confy', features = ["yaml_conf"], default-features = false } console_error_panic_hook = "0.1.7" From 0f943c3e64234c31ba5c62c29178d4d529ab0fc8 Mon Sep 17 00:00:00 2001 From: David Smith Date: Sat, 13 May 2023 12:24:14 -0400 Subject: [PATCH 2/9] Code changes for clap 4 upgrade --- crates/cli/src/lib.rs | 160 +++++++++++++++++---------------- crates/cli/src/main.rs | 68 +++++++------- crates/docs_cli/src/main.rs | 9 +- crates/wasm_interp/src/main.rs | 4 +- 4 files changed, 125 insertions(+), 116 deletions(-) diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs index c2b3bff19e..15a534cdb5 100644 --- a/crates/cli/src/lib.rs +++ b/crates/cli/src/lib.rs @@ -4,7 +4,10 @@ extern crate const_format; use bumpalo::Bump; -use clap::{Arg, ArgMatches, Command, ValueSource}; +use clap::{ + builder::PossibleValuesParser, parser::ValueSource, value_parser, Arg, ArgAction, ArgMatches, + Command, +}; use roc_build::link::{LinkType, LinkingStrategy}; use roc_build::program::{ handle_error_module, handle_loading_problem, standard_load_config, BuildFileError, @@ -18,7 +21,7 @@ use roc_mono::ir::OptLevel; use roc_packaging::cache::RocCacheDir; use roc_packaging::tarball::Compression; use std::env; -use std::ffi::{CString, OsStr}; +use std::ffi::{CString, OsStr, OsString}; use std::io; use std::mem::ManuallyDrop; use std::os::raw::{c_char, c_int}; @@ -72,69 +75,73 @@ pub const ARGS_FOR_APP: &str = "ARGS_FOR_APP"; const VERSION: &str = include_str!("../../../version.txt"); -pub fn build_app<'a>() -> Command<'a> { +pub fn build_app() -> Command { let flag_optimize = Arg::new(FLAG_OPTIMIZE) .long(FLAG_OPTIMIZE) .help("Optimize the compiled program to run faster\n(Optimization takes time to complete.)") + .action(ArgAction::SetTrue) .required(false); let flag_max_threads = Arg::new(FLAG_MAX_THREADS) .long(FLAG_MAX_THREADS) .help("Limit the number of threads (and hence cores) used during compilation") - .takes_value(true) - .validator(|s| s.parse::()) + .num_args(0..=1) + .value_parser(value_parser!(usize)) .required(false); let flag_opt_size = Arg::new(FLAG_OPT_SIZE) .long(FLAG_OPT_SIZE) .help("Optimize the compiled program to have a small binary size\n(Optimization takes time to complete.)") + .action(ArgAction::SetTrue) .required(false); let flag_dev = Arg::new(FLAG_DEV) .long(FLAG_DEV) .help("Make compilation finish as soon as possible, at the expense of runtime performance") + .action(ArgAction::SetTrue) .required(false); let flag_debug = Arg::new(FLAG_DEBUG) .long(FLAG_DEBUG) .help("Store LLVM debug information in the generated program") + .action(ArgAction::SetTrue) .required(false); let flag_time = Arg::new(FLAG_TIME) .long(FLAG_TIME) .help("Print detailed compilation time information") + .action(ArgAction::SetTrue) .required(false); let flag_linker = Arg::new(FLAG_LINKER) .long(FLAG_LINKER) .help("Set which linker to use\n(The surgical linker is enabled by default only when building for wasm32 or x86_64 Linux, because those are the only targets it currently supports. Otherwise the legacy linker is used by default.)") - .possible_values(["surgical", "legacy"]) + .value_parser(["surgical", "legacy"]) .required(false); let flag_prebuilt = Arg::new(FLAG_PREBUILT) .long(FLAG_PREBUILT) .help("Assume the platform has been prebuilt and skip rebuilding the platform\n(This is enabled by default when using `roc build` with a --target other than `--target `.)") - .possible_values(["true", "false"]) + .value_parser(["true", "false"]) .required(false); let flag_wasm_stack_size_kb = Arg::new(FLAG_WASM_STACK_SIZE_KB) .long(FLAG_WASM_STACK_SIZE_KB) .help("Stack size in kilobytes for wasm32 target\n(This only applies when --dev also provided.)") - .takes_value(true) - .validator(|s| s.parse::()) + .num_args(0..=1) + .value_parser(value_parser!(u32)) .required(false); let roc_file_to_run = Arg::new(ROC_FILE) .help("The .roc file of an app to run") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME); let args_for_app = Arg::new(ARGS_FOR_APP) .help("Arguments to pass into the app being run\ne.g. `roc run -- arg1 arg2`") - .allow_invalid_utf8(true) - .multiple_values(true) - .takes_value(true) + .value_parser(value_parser!(OsString)) + .num_args(0..) .allow_hyphen_values(true) .last(true); @@ -151,21 +158,25 @@ pub fn build_app<'a>() -> Command<'a> { .arg(flag_time.clone()) .arg(flag_linker.clone()) .arg(flag_prebuilt.clone()) - .arg(flag_wasm_stack_size_kb.clone()) + .arg(flag_wasm_stack_size_kb) .arg( Arg::new(FLAG_TARGET) .long(FLAG_TARGET) .help("Choose a different target") - .default_value(Target::default().into()) - .possible_values(Target::iter().map(|target| { - Into::<&'static str>::into(target) - })) + .default_value(Into::<&'static str>::into(Target::default())) + .value_parser( + PossibleValuesParser::new( + Target::iter().map(|target| { + Into::<&'static str>::into(target) + }) + )) .required(false), ) .arg( Arg::new(FLAG_LIB) .long(FLAG_LIB) .help("Build a C library instead of an executable") + .action(ArgAction::SetTrue) .required(false), ) .arg( @@ -173,19 +184,20 @@ pub fn build_app<'a>() -> Command<'a> { .long(FLAG_BUNDLE) .help("Create an archive of a package (for example, a .tar, .tar.gz, or .tar.br file), so others can add it as a HTTPS dependency.") .conflicts_with(FLAG_TARGET) - .possible_values([".tar", ".tar.gz", ".tar.br"]) + .value_parser([".tar", ".tar.gz", ".tar.br"]) .required(false), ) .arg( Arg::new(FLAG_NO_LINK) .long(FLAG_NO_LINK) .help("Do not link\n(Instead, just output the `.o` file.)") + .action(ArgAction::SetTrue) .required(false), ) .arg( Arg::new(ROC_FILE) .help("The .roc file to build") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME), ) @@ -203,7 +215,7 @@ pub fn build_app<'a>() -> Command<'a> { .arg( Arg::new(ROC_FILE) .help("The .roc file for the main module") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME) ) @@ -243,13 +255,14 @@ pub fn build_app<'a>() -> Command<'a> { .arg( Arg::new(DIRECTORY_OR_FILES) .index(1) - .multiple_values(true) + .num_args(0..) .required(false) - .allow_invalid_utf8(true)) + .value_parser(value_parser!(OsString))) .arg( Arg::new(FLAG_CHECK) .long(FLAG_CHECK) .help("Checks that specified files are formatted\n(If formatting is needed, return a non-zero exit code.)") + .action(ArgAction::SetTrue) .required(false), ) ) @@ -262,7 +275,7 @@ pub fn build_app<'a>() -> Command<'a> { .arg( Arg::new(ROC_FILE) .help("The .roc file of an app to check") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME), ) @@ -271,9 +284,9 @@ pub fn build_app<'a>() -> Command<'a> { Command::new(CMD_DOCS) .about("Generate documentation for a Roc package") .arg(Arg::new(ROC_FILE) - .multiple_values(true) .help("The package's main .roc file") - .allow_invalid_utf8(true) + .num_args(0..0) + .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME), ) @@ -284,19 +297,19 @@ pub fn build_app<'a>() -> Command<'a> { .arg( Arg::new(GLUE_SPEC) .help("The specification for how to translate Roc types into output files.") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(true) ) .arg( Arg::new(GLUE_DIR) .help("The directory for the generated glue code.\nNote: The implementation can write to any file in this directory.") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(true) ) .arg( Arg::new(ROC_FILE) .help("The .roc file whose exposed types should be translated.") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME) ) @@ -306,23 +319,25 @@ pub fn build_app<'a>() -> Command<'a> { .arg( Arg::new(ROC_FILE) .help("The .roc file for an app using the platform") - .allow_invalid_utf8(true) + .value_parser(value_parser!(PathBuf)) .required(true) ) .arg( Arg::new(FLAG_TARGET) .long(FLAG_TARGET) .help("Choose a different target") - .default_value(Target::default().into()) - .possible_values(Target::iter().map(|target| { - Into::<&'static str>::into(target) - })) + .default_value(Into::<&'static str>::into(Target::default())) + .value_parser( + PossibleValuesParser::new( + Target::iter().map(|target| { + Into::<&'static str>::into(target) + }) + )) .required(false), ) ) - .trailing_var_arg(true) .arg(flag_optimize) - .arg(flag_max_threads.clone()) + .arg(flag_max_threads) .arg(flag_opt_size) .arg(flag_dev) .arg(flag_debug) @@ -338,9 +353,9 @@ pub fn build_app<'a>() -> Command<'a> { .about("Launch the Roc editor (Work In Progress)") .arg( Arg::new(DIRECTORY_OR_FILES) - .multiple_values(true) + .num_args(0..) .required(false) - .allow_invalid_utf8(true) + .value_parser(value_parser!(OsString)) .help("(optional) The directory or files to open on launch"), ), ) @@ -363,9 +378,9 @@ pub enum FormatMode { fn opt_level_from_flags(matches: &ArgMatches) -> OptLevel { match ( - matches.is_present(FLAG_OPTIMIZE), - matches.is_present(FLAG_OPT_SIZE), - matches.is_present(FLAG_DEV), + matches.get_flag(FLAG_OPTIMIZE), + matches.get_flag(FLAG_OPT_SIZE), + matches.get_flag(FLAG_DEV), ) { (true, false, false) => OptLevel::Optimize, (false, true, false) => OptLevel::Size, @@ -389,20 +404,16 @@ pub fn test(matches: &ArgMatches, triple: Triple) -> io::Result { let start_time = Instant::now(); let arena = Bump::new(); - let filename = matches.value_of_os(ROC_FILE).unwrap(); let opt_level = opt_level_from_flags(matches); - let threading = match matches - .value_of(FLAG_MAX_THREADS) - .and_then(|s| s.parse::().ok()) - { + let threading = match matches.get_one::(FLAG_MAX_THREADS) { None => Threading::AllAvailable, Some(0) => user_error!("cannot build with at most 0 threads"), Some(1) => Threading::Single, - Some(n) => Threading::AtMost(n), + Some(n) => Threading::AtMost(*n), }; - let path = Path::new(filename); + let path = matches.get_one::(ROC_FILE).unwrap(); // Spawn the root task if !path.exists() { @@ -454,7 +465,7 @@ pub fn test(matches: &ArgMatches, triple: Triple) -> io::Result { return handle_loading_problem(problem); } Err(LoadMonomorphizedError::ErrorModule(module)) => { - return handle_error_module(module, start_time.elapsed(), filename, false); + return handle_error_module(module, start_time.elapsed(), path.as_os_str(), false); } }; let problems = report_problems_monomorphized(&mut loaded); @@ -540,10 +551,8 @@ pub fn build( use roc_build::program::build_file; use BuildConfig::*; - let filename = matches.value_of_os(ROC_FILE).unwrap(); - let path_buf = { - let path = Path::new(filename); - + let path = matches.get_one::(ROC_FILE).unwrap(); + { // Spawn the root task if !path.exists() { let current_dir = env::current_dir().unwrap(); @@ -567,11 +576,12 @@ pub fn build( process::exit(1); } - if config == BuildConfig::BuildOnly && matches.is_present(FLAG_BUNDLE) { + if config == BuildConfig::BuildOnly && matches.contains_id(FLAG_BUNDLE) { let start_time = Instant::now(); let compression = - Compression::try_from(matches.value_of(FLAG_BUNDLE).unwrap()).unwrap(); + Compression::try_from(matches.get_one::(FLAG_BUNDLE).unwrap().as_str()) + .unwrap(); // Print a note of advice. This is mainly here because brotli takes so long but produces // such smaller output files; the idea is to encourage people to wait for brotli, @@ -608,9 +618,7 @@ pub fn build( return Ok(0); } - - path.to_path_buf() - }; + } // the process will end after this function, // so we don't want to spend time freeing these values @@ -624,7 +632,7 @@ pub fn build( // Note: This allows using `--dev` with `--optimize`. // This means frontend optimizations and dev backend. - let code_gen_backend = if matches.is_present(FLAG_DEV) { + let code_gen_backend = if matches.get_flag(FLAG_DEV) { if matches!(triple.architecture, Architecture::Wasm32) { CodeGenBackend::Wasm } else { @@ -639,17 +647,14 @@ pub fn build( CodeGenBackend::Llvm(backend_mode) }; - let emit_debug_info = matches.is_present(FLAG_DEBUG); - let emit_timings = matches.is_present(FLAG_TIME); + let emit_debug_info = matches.get_flag(FLAG_DEBUG); + let emit_timings = matches.get_flag(FLAG_TIME); - let threading = match matches - .value_of(FLAG_MAX_THREADS) - .and_then(|s| s.parse::().ok()) - { + let threading = match matches.get_one::(FLAG_MAX_THREADS) { None => Threading::AllAvailable, Some(0) => user_error!("cannot build with at most 0 threads"), Some(1) => Threading::Single, - Some(n) => Threading::AtMost(n), + Some(n) => Threading::AtMost(*n), }; let wasm_dev_backend = matches!(code_gen_backend, CodeGenBackend::Wasm); @@ -657,15 +662,15 @@ pub fn build( let linking_strategy = if wasm_dev_backend { LinkingStrategy::Additive } else if !roc_linker::supported(link_type, &triple) - || matches.value_of(FLAG_LINKER) == Some("legacy") + || matches.get_one::(FLAG_LINKER).map(|s| s.as_str()) == Some("legacy") { LinkingStrategy::Legacy } else { LinkingStrategy::Surgical }; - let prebuilt = if matches.is_present(FLAG_PREBUILT) { - matches.value_of(FLAG_PREBUILT) == Some("true") + let prebuilt = if matches.contains_id(FLAG_PREBUILT) { + matches.get_one::(FLAG_PREBUILT).map(|s| s.as_str()) == Some("true") } else { // When compiling for a different target, default to assuming a prebuilt platform. // Otherwise compilation would most likely fail because many toolchains assume you're compiling for the current machine. @@ -674,10 +679,9 @@ pub fn build( }; let wasm_dev_stack_bytes: Option = matches - .try_get_one::<&str>(FLAG_WASM_STACK_SIZE_KB) + .try_get_one::(FLAG_WASM_STACK_SIZE_KB) .ok() .flatten() - .and_then(|s| s.parse::().ok()) .map(|x| x * 1024); let build_ordering = match config { @@ -696,7 +700,7 @@ pub fn build( let res_binary_path = build_file( &arena, &triple, - path_buf, + path.to_owned(), code_gen_options, emit_timings, link_type, @@ -752,7 +756,10 @@ pub fn build( ); } - let args = matches.values_of_os(ARGS_FOR_APP).unwrap_or_default(); + let args = matches + .get_many::(ARGS_FOR_APP) + .unwrap_or_default() + .map(|s| s.as_os_str()); // don't waste time deallocating; the process ends anyway // ManuallyDrop will leak the bytes because we don't drop manually @@ -784,7 +791,10 @@ pub fn build( ); } - let args = matches.values_of_os(ARGS_FOR_APP).unwrap_or_default(); + let args = matches + .get_many::(ARGS_FOR_APP) + .unwrap_or_default() + .map(|s| s.as_os_str()); // don't waste time deallocating; the process ends anyway // ManuallyDrop will leak the bytes because we don't drop manually @@ -795,7 +805,7 @@ pub fn build( } } Err(BuildFileError::ErrorModule { module, total_time }) => { - handle_error_module(module, total_time, filename, true) + handle_error_module(module, total_time, path.as_os_str(), true) } Err(BuildFileError::LoadingProblem(problem)) => handle_loading_problem(problem), } diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index a67cc259fc..3d0505eacb 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -16,6 +16,7 @@ use roc_packaging::cache::{self, RocCacheDir}; use std::fs::{self, FileType}; use std::io; use std::path::{Path, PathBuf}; +use std::str::FromStr; use target_lexicon::Triple; #[macro_use] @@ -35,7 +36,7 @@ fn main() -> io::Result<()> { let exit_code = match matches.subcommand() { None => { - if matches.is_present(ROC_FILE) { + if matches.contains_id(ROC_FILE) { build( &matches, BuildConfig::BuildAndRunIfNoErrors, @@ -50,7 +51,7 @@ fn main() -> io::Result<()> { } } Some((CMD_RUN, matches)) => { - if matches.is_present(ROC_FILE) { + if matches.contains_id(ROC_FILE) { build( matches, BuildConfig::BuildAndRun, @@ -65,7 +66,7 @@ fn main() -> io::Result<()> { } } Some((CMD_TEST, matches)) => { - if matches.is_present(ROC_FILE) { + if matches.contains_id(ROC_FILE) { test(matches, Triple::host()) } else { eprintln!("What .roc file do you want to test? Specify it at the end of the `roc test` command."); @@ -74,7 +75,7 @@ fn main() -> io::Result<()> { } } Some((CMD_DEV, matches)) => { - if matches.is_present(ROC_FILE) { + if matches.contains_id(ROC_FILE) { build( matches, BuildConfig::BuildAndRunIfNoErrors, @@ -89,12 +90,12 @@ fn main() -> io::Result<()> { } } Some((CMD_GLUE, matches)) => { - let input_path = Path::new(matches.value_of_os(ROC_FILE).unwrap()); - let output_path = Path::new(matches.value_of_os(GLUE_DIR).unwrap()); - let spec_path = Path::new(matches.value_of_os(GLUE_SPEC).unwrap()); + let input_path = matches.get_one::(ROC_FILE).unwrap(); + let output_path = matches.get_one::(GLUE_DIR).unwrap(); + let spec_path = matches.get_one::(GLUE_SPEC).unwrap(); // have the backend supply `roc_alloc` and friends - let backend = match matches.is_present(FLAG_DEV) { + let backend = match matches.get_flag(FLAG_DEV) { true => CodeGenBackend::Assembly(AssemblyBackendMode::Test), false => CodeGenBackend::Llvm(LlvmBackendMode::BinaryGlue), }; @@ -108,8 +109,12 @@ fn main() -> io::Result<()> { } } Some((CMD_GEN_STUB_LIB, matches)) => { - let input_path = Path::new(matches.value_of_os(ROC_FILE).unwrap()); - let target: Target = matches.value_of_t(FLAG_TARGET).unwrap_or_default(); + let input_path = matches.get_one::(ROC_FILE).unwrap(); + let target = matches + .get_one::(FLAG_TARGET) + .map(|s| Target::from_str(s).ok()) + .flatten() + .unwrap_or_default(); roc_linker::generate_stub_lib( input_path, RocCacheDir::Persistent(cache::roc_cache_dir().as_path()), @@ -117,11 +122,12 @@ fn main() -> io::Result<()> { ) } Some((CMD_BUILD, matches)) => { - let target: Target = matches.value_of_t(FLAG_TARGET).unwrap_or_default(); - let link_type = match ( - matches.is_present(FLAG_LIB), - matches.is_present(FLAG_NO_LINK), - ) { + let target = matches + .get_one::(FLAG_TARGET) + .map(|s| Target::from_str(s).ok()) + .flatten() + .unwrap_or_default(); + let link_type = match (matches.get_flag(FLAG_LIB), matches.get_flag(FLAG_NO_LINK)) { (true, false) => LinkType::Dylib, (true, true) => user_error!("build can only be one of `--lib` or `--no-link`"), (false, true) => LinkType::None, @@ -139,22 +145,18 @@ fn main() -> io::Result<()> { Some((CMD_CHECK, matches)) => { let arena = bumpalo::Bump::new(); - let emit_timings = matches.is_present(FLAG_TIME); - let filename = matches.value_of_os(ROC_FILE).unwrap(); - let roc_file_path = PathBuf::from(filename); - let threading = match matches - .value_of(roc_cli::FLAG_MAX_THREADS) - .and_then(|s| s.parse::().ok()) - { + let emit_timings = matches.get_flag(FLAG_TIME); + let roc_file_path = matches.get_one::(ROC_FILE).unwrap(); + let threading = match matches.get_one::(roc_cli::FLAG_MAX_THREADS) { None => Threading::AllAvailable, Some(0) => user_error!("cannot build with at most 0 threads"), Some(1) => Threading::Single, - Some(n) => Threading::AtMost(n), + Some(n) => Threading::AtMost(*n), }; match check_file( &arena, - roc_file_path, + roc_file_path.to_owned(), emit_timings, RocCacheDir::Persistent(cache::roc_cache_dir().as_path()), threading, @@ -203,11 +205,11 @@ fn main() -> io::Result<()> { Some((CMD_REPL, _)) => Ok(roc_repl_cli::main()), Some((CMD_EDIT, matches)) => { match matches - .values_of_os(DIRECTORY_OR_FILES) + .get_many::(DIRECTORY_OR_FILES) .map(|mut values| values.next()) { - Some(Some(os_str)) => { - launch_editor(Some(Path::new(os_str)))?; + Some(Some(os_string)) => { + launch_editor(Some(Path::new(os_string)))?; } _ => { launch_editor(None)?; @@ -218,14 +220,14 @@ fn main() -> io::Result<()> { Ok(0) } Some((CMD_DOCS, matches)) => { - let root_filename = matches.value_of_os(ROC_FILE).unwrap(); + let root_path = matches.get_one::(ROC_FILE).unwrap(); - generate_docs_html(PathBuf::from(root_filename)); + generate_docs_html(root_path.to_owned()); Ok(0) } Some((CMD_FORMAT, matches)) => { - let maybe_values = matches.values_of_os(DIRECTORY_OR_FILES); + let maybe_values = matches.get_many::(DIRECTORY_OR_FILES); let mut values: Vec = Vec::new(); @@ -241,8 +243,8 @@ fn main() -> io::Result<()> { } } Some(os_values) => { - for os_str in os_values { - values.push(os_str.to_os_string()); + for os_string in os_values { + values.push(os_string.to_owned()); } } } @@ -255,7 +257,7 @@ fn main() -> io::Result<()> { roc_files_recursive(os_str.as_os_str(), metadata.file_type(), &mut roc_files)?; } - let format_mode = match matches.is_present(FLAG_CHECK) { + let format_mode = match matches.get_flag(FLAG_CHECK) { true => FormatMode::CheckOnly, false => FormatMode::Format, }; diff --git a/crates/docs_cli/src/main.rs b/crates/docs_cli/src/main.rs index ae40dab7b1..40f67f560c 100644 --- a/crates/docs_cli/src/main.rs +++ b/crates/docs_cli/src/main.rs @@ -1,5 +1,5 @@ //! Provides a binary that is only used for static build servers. -use clap::{Arg, Command}; +use clap::{value_parser, Arg, Command}; use roc_docs::generate_docs_html; use std::io; use std::path::PathBuf; @@ -12,16 +12,15 @@ fn main() -> io::Result<()> { .about("Generate documentation for a Roc package") .arg( Arg::new(ROC_FILE) - .multiple_values(true) .help("The package's main .roc file") - .allow_invalid_utf8(true) - .required(false) + .num_args(0..) + .value_parser(value_parser!(PathBuf)) .default_value(DEFAULT_ROC_FILENAME), ) .get_matches(); // Populate roc_files - generate_docs_html(PathBuf::from(matches.value_of_os(ROC_FILE).unwrap())); + generate_docs_html(matches.get_one::(ROC_FILE).unwrap().to_owned()); Ok(()) } diff --git a/crates/wasm_interp/src/main.rs b/crates/wasm_interp/src/main.rs index 049a018416..b7b3a5dea1 100644 --- a/crates/wasm_interp/src/main.rs +++ b/crates/wasm_interp/src/main.rs @@ -44,8 +44,7 @@ fn main() -> io::Result<()> { let args_for_app = Arg::new(ARGS_FOR_APP) .help("Arguments to pass into the WebAssembly app\ne.g. `roc_wasm_interp app.wasm 123 123.45`") - .multiple_values(true) - .takes_value(true); + .num_args(0..); let app = Command::new("roc_wasm_interp") .about("Run the given .wasm file") @@ -53,7 +52,6 @@ fn main() -> io::Result<()> { .arg(flag_debug) .arg(flag_hex) .arg(wasm_file_to_run) - .trailing_var_arg(true) .arg(args_for_app); // Parse the command line arguments From 003aacbf280336fc4f863f368a19eb865ed6a508 Mon Sep 17 00:00:00 2001 From: David Smith Date: Sun, 14 May 2023 08:39:37 -0400 Subject: [PATCH 3/9] Remove unnecessary `num_args` for an optional single arg --- crates/cli/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs index 15a534cdb5..81c08d01e6 100644 --- a/crates/cli/src/lib.rs +++ b/crates/cli/src/lib.rs @@ -85,7 +85,6 @@ pub fn build_app() -> Command { let flag_max_threads = Arg::new(FLAG_MAX_THREADS) .long(FLAG_MAX_THREADS) .help("Limit the number of threads (and hence cores) used during compilation") - .num_args(0..=1) .value_parser(value_parser!(usize)) .required(false); @@ -128,7 +127,6 @@ pub fn build_app() -> Command { let flag_wasm_stack_size_kb = Arg::new(FLAG_WASM_STACK_SIZE_KB) .long(FLAG_WASM_STACK_SIZE_KB) .help("Stack size in kilobytes for wasm32 target\n(This only applies when --dev also provided.)") - .num_args(0..=1) .value_parser(value_parser!(u32)) .required(false); From 54c130ca1ab96fbf2b45a9bff6d5a2875bbebd3b Mon Sep 17 00:00:00 2001 From: David Smith Date: Sun, 14 May 2023 20:30:27 -0400 Subject: [PATCH 4/9] Address review comments - Remove `num_args` call that wasn't supposed to be there - Factor out shared value parser with non-trivial init --- crates/cli/src/lib.rs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs index 81c08d01e6..10d6af0f37 100644 --- a/crates/cli/src/lib.rs +++ b/crates/cli/src/lib.rs @@ -143,6 +143,8 @@ pub fn build_app() -> Command { .allow_hyphen_values(true) .last(true); + let build_target_values_parser = + PossibleValuesParser::new(Target::iter().map(Into::<&'static str>::into)); let app = Command::new("roc") .version(concatcp!(VERSION, "\n")) .about("Run the given .roc file, if there are no compilation errors.\nYou can use one of the SUBCOMMANDS below to do something else!") @@ -162,12 +164,7 @@ pub fn build_app() -> Command { .long(FLAG_TARGET) .help("Choose a different target") .default_value(Into::<&'static str>::into(Target::default())) - .value_parser( - PossibleValuesParser::new( - Target::iter().map(|target| { - Into::<&'static str>::into(target) - }) - )) + .value_parser(build_target_values_parser.clone()) .required(false), ) .arg( @@ -283,7 +280,6 @@ pub fn build_app() -> Command { .about("Generate documentation for a Roc package") .arg(Arg::new(ROC_FILE) .help("The package's main .roc file") - .num_args(0..0) .value_parser(value_parser!(PathBuf)) .required(false) .default_value(DEFAULT_ROC_FILENAME), @@ -325,12 +321,7 @@ pub fn build_app() -> Command { .long(FLAG_TARGET) .help("Choose a different target") .default_value(Into::<&'static str>::into(Target::default())) - .value_parser( - PossibleValuesParser::new( - Target::iter().map(|target| { - Into::<&'static str>::into(target) - }) - )) + .value_parser(build_target_values_parser) .required(false), ) ) From d06d0dbf9cf991eda791ddccf6db97a43fe08d63 Mon Sep 17 00:00:00 2001 From: David Smith Date: Mon, 15 May 2023 09:52:04 -0400 Subject: [PATCH 5/9] Convert --prebuilt-platform to bool flag With this change, it's no longer possible to cross-compile to any target other than wasm. --- crates/cli/src/lib.rs | 21 ++++++++++++--------- crates/cli/tests/cli_run.rs | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs index 10d6af0f37..3c1d70f664 100644 --- a/crates/cli/src/lib.rs +++ b/crates/cli/src/lib.rs @@ -120,8 +120,8 @@ pub fn build_app() -> Command { let flag_prebuilt = Arg::new(FLAG_PREBUILT) .long(FLAG_PREBUILT) - .help("Assume the platform has been prebuilt and skip rebuilding the platform\n(This is enabled by default when using `roc build` with a --target other than `--target `.)") - .value_parser(["true", "false"]) + .help("Assume the platform has been prebuilt and skip rebuilding the platform\n(This is enabled implicitly when using `roc build` with a --target other than `--target `, unless the target is wasm.)") + .action(ArgAction::SetTrue) .required(false); let flag_wasm_stack_size_kb = Arg::new(FLAG_WASM_STACK_SIZE_KB) @@ -658,13 +658,16 @@ pub fn build( LinkingStrategy::Surgical }; - let prebuilt = if matches.contains_id(FLAG_PREBUILT) { - matches.get_one::(FLAG_PREBUILT).map(|s| s.as_str()) == Some("true") - } else { - // When compiling for a different target, default to assuming a prebuilt platform. - // Otherwise compilation would most likely fail because many toolchains assume you're compiling for the current machine. - // We make an exception for Wasm, because cross-compiling is the norm in that case. - triple != Triple::host() && !matches!(triple.architecture, Architecture::Wasm32) + let prebuilt = { + let cross_compile = triple != Triple::host(); + let targeting_wasm = matches!(triple.architecture, Architecture::Wasm32); + + matches.get_flag(FLAG_PREBUILT) || + // When compiling for a different target, assume a prebuilt platform. + // Otherwise compilation would most likely fail because many toolchains + // assume you're compiling for the current machine. We make an exception + // for Wasm, because cross-compiling is the norm in that case. + (cross_compile && !targeting_wasm) }; let wasm_dev_stack_bytes: Option = matches diff --git a/crates/cli/tests/cli_run.rs b/crates/cli/tests/cli_run.rs index 6005978c48..66ef2967b8 100644 --- a/crates/cli/tests/cli_run.rs +++ b/crates/cli/tests/cli_run.rs @@ -51,7 +51,7 @@ mod cli_run { const OPTIMIZE_FLAG: &str = concatcp!("--", roc_cli::FLAG_OPTIMIZE); const LINKER_FLAG: &str = concatcp!("--", roc_cli::FLAG_LINKER); const CHECK_FLAG: &str = concatcp!("--", roc_cli::FLAG_CHECK); - const PREBUILT_PLATFORM: &str = concatcp!("--", roc_cli::FLAG_PREBUILT, "=true"); + const PREBUILT_PLATFORM: &str = concatcp!("--", roc_cli::FLAG_PREBUILT); #[allow(dead_code)] const TARGET_FLAG: &str = concatcp!("--", roc_cli::FLAG_TARGET); From e1e72a3713384d55c56fb0ca529a9fccb179c478 Mon Sep 17 00:00:00 2001 From: David Smith Date: Mon, 15 May 2023 12:31:42 -0400 Subject: [PATCH 6/9] Updates after rebase --- Cargo.lock | 543 ++++++++++++++++++++---------------------- crates/cli/src/lib.rs | 4 +- 2 files changed, 265 insertions(+), 282 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4deb4f4999..f93741602b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c" +checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -57,9 +57,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -225,7 +225,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.6.2", "object", "rustc-demangle", ] @@ -324,9 +324,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -369,13 +369,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -507,7 +507,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -572,9 +572,9 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags", "block", @@ -615,7 +615,7 @@ dependencies = [ [[package]] name = "confy" version = "0.5.1" -source = "git+https://github.com/rust-cli/confy#700337e5a3fbc12f4f49fc9b7ce449b1b71040ee" +source = "git+https://github.com/rust-cli/confy#d5abd6cce9b936130832cfb4e1ed8afd7e1c488b" dependencies = [ "directories", "serde", @@ -667,9 +667,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "copyless" @@ -707,7 +707,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys 0.8.4", "libc", ] @@ -719,9 +719,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -775,9 +775,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -841,9 +841,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -941,11 +941,11 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "cvt" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac344c7efccb80cd25bc61b2170aec26f2f693fd40e765a539a1243db48c71" +checksum = "d2ae9bf77fbf2d39ef573205d554d87e86c12f1994e9ea335b0651b9b278bcf1" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -1111,9 +1111,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dunce" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" @@ -1160,24 +1160,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1202,25 +1191,25 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.10" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef1a30ae415c3a691a4f41afddc2dbcd6d70baf338368d85ebc1e8ed92cedb9" +checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if 1.0.0", - "rustix 0.36.9", - "windows-sys 0.45.0", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1234,12 +1223,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1274,9 +1263,9 @@ dependencies = [ [[package]] name = "fs_at" -version = "0.1.1" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab60b097d8208fe02d24ae954c3248a9436f96edefa8f4b9fcb0f26d60d003a9" +checksum = "0504bab20f4487fdf1c20ed48e3e32c7951827a778cd3dfded1768f90b6abb0a" dependencies = [ "aligned", "cfg-if 1.0.0", @@ -1284,7 +1273,7 @@ dependencies = [ "libc", "nix 0.26.2", "smart-default", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1301,9 +1290,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1316,9 +1305,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1326,15 +1315,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1343,38 +1332,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1399,9 +1388,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1419,9 +1408,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1488,9 +1477,9 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ "bitflags", "gpu-alloc-types", @@ -1527,9 +1516,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1650,9 +1639,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1740,9 +1729,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -1785,9 +1774,9 @@ checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78" [[package]] name = "insta" -version = "1.28.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" +checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" dependencies = [ "console", "lazy_static", @@ -1810,30 +1799,31 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix 0.37.3", - "windows-sys 0.45.0", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -1868,9 +1858,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] @@ -1909,9 +1899,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libloading" @@ -1925,15 +1915,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.30" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -1958,15 +1948,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "llvm-sys" @@ -2098,18 +2082,18 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.34" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2126,6 +2110,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.6" @@ -2297,11 +2290,11 @@ checksum = "aeaf4ad7403de93e699c191202f017118df734d3850b01e13a3a8b2e6953d3c9" [[package]] name = "normpath" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972dec05f98e7c787ede35d7a9ea4735eb7788c299287352757b3def6cc1f7b5" +checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" dependencies = [ - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2421,9 +2414,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "ordered-float" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits", ] @@ -2445,9 +2438,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ "ttf-parser", ] @@ -2591,9 +2584,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -2601,9 +2594,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -2611,22 +2604,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -2689,9 +2682,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plotters" @@ -2750,18 +2743,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" +checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" [[package]] name = "proptest" @@ -2778,7 +2771,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.6.29", "rusty-fork", "tempfile", "unarray", @@ -2961,13 +2954,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -2976,14 +2969,20 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "remove_dir_all" @@ -2996,9 +2995,9 @@ dependencies = [ [[package]] name = "remove_dir_all" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7174320e07c29945955cedd70b865995b286847111c8308d349a1f3a9e3af555" +checksum = "23895cfadc1917fed9c6ed76a8c2903615fa3704f7493ff82b364c6540acc02b" dependencies = [ "aligned", "cfg-if 1.0.0", @@ -3032,9 +3031,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64 0.21.0", "bytes", @@ -3234,7 +3233,7 @@ dependencies = [ "cli_utils", "const_format", "criterion", - "errno 0.3.0", + "errno", "indoc", "inkwell", "libc", @@ -3994,7 +3993,7 @@ name = "roc_test_utils" version = "0.0.1" dependencies = [ "pretty_assertions", - "remove_dir_all 0.8.1", + "remove_dir_all 0.8.2", ] [[package]] @@ -4056,9 +4055,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -4072,35 +4071,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.17", ] [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" -dependencies = [ - "bitflags", - "errno 0.3.0", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.1", - "windows-sys 0.45.0", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4222,9 +4207,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "semver-parser" @@ -4237,9 +4222,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.153" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a382c72b4ba118526e187430bb4963cd6d55051ebf13d9b25574d379cc98d20" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -4268,20 +4253,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.153" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef476a5790f0f6decbc66726b6e5d63680ed518283e64c7df415989d880954f" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -4424,13 +4409,13 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smart-default" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -4603,9 +4588,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -4631,9 +4616,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "tempfile" @@ -4806,22 +4791,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -4845,9 +4830,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -4857,15 +4842,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -4897,19 +4882,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", "socket2", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4925,9 +4909,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4954,9 +4938,9 @@ checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", "toml_datetime", @@ -4994,20 +4978,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -5026,9 +5010,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -5050,9 +5034,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "ttf-parser" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" [[package]] name = "twox-hash" @@ -5127,9 +5111,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -5195,9 +5179,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom", ] @@ -5280,12 +5264,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -5314,9 +5297,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -5324,24 +5307,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -5351,9 +5334,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5361,22 +5344,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "wayland-client" @@ -5629,13 +5612,13 @@ 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", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -5644,7 +5627,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.42.1", + "windows-targets 0.42.2", ] [[package]] @@ -5658,17 +5641,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" 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.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -5688,9 +5671,9 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -5700,9 +5683,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -5712,9 +5695,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -5724,9 +5707,9 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -5736,9 +5719,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -5748,9 +5731,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -5760,9 +5743,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -5805,9 +5788,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.3.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -5841,9 +5824,9 @@ dependencies = [ [[package]] name = "x11-clipboard" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0827f86aa910c4e73329a4f619deabe88ebb4b042370bf023c2d5d8b4eb54695" +checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" dependencies = [ "x11rb", ] @@ -5907,9 +5890,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" [[package]] name = "yaml-rust" diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs index 3c1d70f664..97978019b1 100644 --- a/crates/cli/src/lib.rs +++ b/crates/cli/src/lib.rs @@ -407,7 +407,7 @@ pub fn test(matches: &ArgMatches, triple: Triple) -> io::Result { // Spawn the root task if !path.exists() { let current_dir = env::current_dir().unwrap(); - let expected_file_path = current_dir.join(filename); + let expected_file_path = current_dir.join(path); let current_dir_string = current_dir.display(); let expected_file_path_string = expected_file_path.display(); @@ -545,7 +545,7 @@ pub fn build( // Spawn the root task if !path.exists() { let current_dir = env::current_dir().unwrap(); - let expected_file_path = current_dir.join(filename); + let expected_file_path = current_dir.join(path); let current_dir_string = current_dir.display(); let expected_file_path_string = expected_file_path.display(); From 1aa45240fd33130dece4c00122d7b8e18184cf09 Mon Sep 17 00:00:00 2001 From: David Smith Date: Mon, 15 May 2023 12:53:58 -0400 Subject: [PATCH 7/9] Update --prebuilt-platform usage in comments and error messages. --- crates/compiler/build/src/program.rs | 13 +++++++------ crates/packaging/src/cache.rs | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/compiler/build/src/program.rs b/crates/compiler/build/src/program.rs index de0c9d436f..d69d5e94c7 100644 --- a/crates/compiler/build/src/program.rs +++ b/crates/compiler/build/src/program.rs @@ -528,7 +528,7 @@ fn gen_from_mono_module_dev_wasm32<'a>( let host_bytes = std::fs::read(preprocessed_host_path).unwrap_or_else(|_| { internal_error!( - "Failed to read host object file {}! Try setting --prebuilt-platform=false", + "Failed to read host object file {}! Try omitting --prebuilt-platform", preprocessed_host_path.display() ) }); @@ -794,7 +794,7 @@ fn build_loaded_file<'a>( }; // For example, if we're loading the platform from a URL, it's automatically prebuilt - // even if the --prebuilt-platform=true CLI flag wasn't set. + // even if the --prebuilt-platform CLI flag wasn't set. let is_platform_prebuilt = prebuilt_requested || loaded.uses_prebuilt_platform; let cwd = app_module_path.parent().unwrap(); @@ -1036,9 +1036,10 @@ fn build_loaded_file<'a>( } fn invalid_prebuilt_platform(prebuilt_requested: bool, preprocessed_host_path: PathBuf) { - let prefix = match prebuilt_requested { - true => "Because I was run with --prebuilt-platform=true, ", - false => "", + let prefix = if prebuilt_requested { + "Because I was run with --prebuilt-platform, " + } else { + "" }; let preprocessed_host_path_str = preprocessed_host_path.to_string_lossy(); @@ -1057,7 +1058,7 @@ fn invalid_prebuilt_platform(prebuilt_requested: bool, preprocessed_host_path: P However, it was not there!{} - If you have the platform's source code locally, you may be able to generate it by re-running this command with --prebuilt-platform=false + If you have the platform's source code locally, you may be able to generate it by re-running this command omitting --prebuilt-platform "# ), prefix, diff --git a/crates/packaging/src/cache.rs b/crates/packaging/src/cache.rs index bf81493f32..bafd1bd8a1 100644 --- a/crates/packaging/src/cache.rs +++ b/crates/packaging/src/cache.rs @@ -44,7 +44,7 @@ fn nixos_error_if_dynamic(url: &str, dest_dir: &Path) { You can:\n\n\t\ - Download the source of the platform and build it locally, like in this example:\n\t \ https://github.com/roc-lang/roc/blob/main/examples/platform-switching/rocLovesRust.roc.\n\t \ - When building your roc application, you can use the flag `--prebuilt-platform=true` to prevent the platform from being rebuilt every time.\n\t \ + When building your roc application, you can use the flag `--prebuilt-platform` to prevent the platform from being rebuilt every time.\n\t \ For some graphical platforms you may need to use https://github.com/guibou/nixGL.\n\n\t\ - Contact the author of the platform to ask them to statically link their platform.\n\t \ musl can be used to prevent a dynamic dependency on the systems' libc.\n\t \ From 945e0bfed14b7a3849b5bcad88dbb88fd71f4523 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Mon, 15 May 2023 19:34:13 +0200 Subject: [PATCH 8/9] Update confy sha nix I think confy dependencies changes, so the sha needs to be updated Signed-off-by: Anton-4 <17049058+Anton-4@users.noreply.github.com> --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index bcb047986c..c6bab66358 100644 --- a/default.nix +++ b/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "confy-0.5.1" = "sha256-3PQdz9W/uJd4CaUZdwAd2u3JJ100SFAoKLCFE6THRZI="; + "confy-0.5.1" = "sha256-KML/uoze2djsFhYk488QAtauethDaC+0aZ3q56yAhuY="; "criterion-0.3.5" = "sha256-+FibPQGiR45g28xCHcM0pMN+C+Q8gO8206Wb5fiTy+k="; "inkwell-0.1.0" = "sha256-1kpvY3naS33B99nuu5ZYhb7mdddAyG+DkbUl/RG1Ptg="; "plotters-0.3.1" = "sha256-noy/RSjoEPZZbOJTZw1yxGcX5S+2q/7mxnUrzDyxOFw="; From dfc365b5b3a22776d66f17a86392302658e09c34 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Mon, 15 May 2023 20:03:15 +0200 Subject: [PATCH 9/9] clippy fix Signed-off-by: Anton-4 <17049058+Anton-4@users.noreply.github.com> --- crates/docs/src/lib.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/docs/src/lib.rs b/crates/docs/src/lib.rs index 568ab261a7..d1f00a506d 100644 --- a/crates/docs/src/lib.rs +++ b/crates/docs/src/lib.rs @@ -133,8 +133,9 @@ pub fn generate_docs_html(root_file: PathBuf) { set }; + // TODO fix: as is, this overrides an existing index.html // Write index.html for package (/index.html) - { + /*{ let rendered_package = template_html .replace( "", @@ -155,7 +156,7 @@ pub fn generate_docs_html(root_file: PathBuf) { error ) }); - } + }*/ // Write each package module's index.html file for module_docs in loaded_module.docs_by_module.values() { @@ -195,7 +196,8 @@ fn page_title(package_name: &str, module_name: &str) -> String { format!("{module_name} - {package_name}") } -fn render_package_index(root_module: &LoadedModule) -> String { +// TODO re-enable with let rendered_package = template_html... +/*fn render_package_index(root_module: &LoadedModule) -> String { // The list items containing module links let mut module_list_buf = String::new(); @@ -226,7 +228,7 @@ fn render_package_index(root_module: &LoadedModule) -> String { ); index_buf -} +}*/ fn render_module_documentation( module: &ModuleDocumentation,