From d2acd41987866364f7f1b9be10b9f2f1f3f0e742 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Thu, 31 Aug 2023 17:21:11 -0500 Subject: [PATCH 01/35] Changed array size to be 40 for E0308 --- base/src/types/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/types/mod.rs b/base/src/types/mod.rs index 6128abd06..7e7b17692 100644 --- a/base/src/types/mod.rs +++ b/base/src/types/mod.rs @@ -4626,7 +4626,7 @@ mod tests { #[cfg(target_pointer_width = "64")] // Safeguard against accidentally growing Type as it is a core type - const _: [(); 8 * 6] = [(); std::mem::size_of::>()]; + const _: [(); 8 * 5] = [(); std::mem::size_of::>()]; #[test] fn walk_move_types_test() { From 8bca9294243a81e89fb3d3f677e65fda85b1fd95 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Thu, 31 Aug 2023 19:37:59 -0500 Subject: [PATCH 02/35] Upgraded dependencies Upgraded all dependencies using cargo-edit upgrade to solve previous errors in compilation --- Cargo.lock | 1810 ++++++++++++++++++++--------------------- Cargo.toml | 128 +-- base/Cargo.toml | 22 +- c-api/Cargo.toml | 4 +- check/Cargo.toml | 14 +- codegen/Cargo.toml | 12 +- completion/Cargo.toml | 10 +- doc/Cargo.toml | 32 +- format/Cargo.toml | 16 +- parser/Cargo.toml | 16 +- repl/Cargo.toml | 26 +- vm/Cargo.toml | 46 +- 12 files changed, 1063 insertions(+), 1073 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b43e73833..b4bda650f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.16.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -19,31 +19,33 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] -name = "aho-corasick" -version = "0.7.18" +name = "ahash" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "memchr", + "cfg-if 1.0.0", + "once_cell", + "version_check", ] [[package]] -name = "ansi_term" -version = "0.11.0" +name = "aho-corasick" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ - "winapi", + "memchr", ] [[package]] @@ -57,9 +59,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.44" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "anymap" @@ -69,12 +71,12 @@ checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" [[package]] name = "app_dirs2" -version = "2.3.2" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55db1808b75fbf537160a28c59f868018c480a9a7f05ab6d6a760cba7d4cd303" +checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e" dependencies = [ "jni", - "ndk-glue", + "ndk-context", "winapi", "xdg", ] @@ -105,13 +107,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -120,28 +122,22 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] [[package]] name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - -[[package]] -name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.61" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -154,9 +150,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bincode" @@ -169,9 +165,9 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ "bit-vec", ] @@ -189,24 +185,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.7.3" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] -name = "block-padding" -version = "0.1.5" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "byte-tools", + "generic-array", ] [[package]] @@ -217,21 +207,26 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", "serde", ] [[package]] -name = "bumpalo" -version = "3.12.0" +name = "bstr" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +dependencies = [ + "memchr", + "regex-automata 0.3.7", + "serde", +] [[package]] -name = "byte-tools" -version = "0.3.1" +name = "bumpalo" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytecount" @@ -247,34 +242,44 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cached" -version = "0.20.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c20611fb80d002056306ce7ec754bb7485caa30ac2fbe25341ef470ce3c76aa" +checksum = "14d3b04f85a6ef9fe543b2564ec8630bdf3363aa9bf664a1bfc85033e7350aaf" dependencies = [ + "hashbrown 0.11.2", "once_cell", ] +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + [[package]] name = "cargo-deadlinks" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36dec32bd38953ad8b26b40bd10a37f0a1e6d71dec22f2d3e33a538754b3015a" +checksum = "215494a5342e42273bf609f4d9dba5a133bcba409defc9675acc664adecfcaa0" dependencies = [ "cached", - "cargo_metadata 0.12.3", - "env_logger 0.8.4", + "cargo_metadata 0.14.2", + "env_logger", "log", "lol_html", "num_cpus", "once_cell", "percent-encoding", - "pico-args 0.3.4", + "pico-args", "rayon", "regex", "serde", @@ -287,9 +292,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] @@ -308,13 +313,13 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ + "camino", "cargo-platform", - "semver 0.11.0", - "semver-parser 0.10.2", + "semver 1.0.18", "serde", "serde_json", ] @@ -328,11 +333,20 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cc" -version = "1.0.70" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cesu8" @@ -352,36 +366,21 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", "vec_map", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "codespan" version = "0.11.1" @@ -411,9 +410,9 @@ checksum = "f168712e49987bd2f51cb855c4585999e12b1a0abdff60fea4b81b41f2010264" [[package]] name = "combine" -version = "4.6.1" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a909e4d93292cd8e9c42e189f61681eff9d67b6541f96b8a1a737f23737bd001" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes", "memchr", @@ -421,9 +420,9 @@ dependencies = [ [[package]] name = "compiletest_rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64698e5e2435db061a85e6320af12c30c5fd88eb84b35d2c1e03ce4f143255ca" +checksum = "29843cb8d351febf86557681d049d1e1652b81a086a190fa1173c07fd17fbf83" dependencies = [ "diff", "filetime", @@ -443,22 +442,27 @@ dependencies = [ [[package]] name = "console" -version = "0.14.1" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", - "winapi", + "windows-sys 0.45.0", ] +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -466,18 +470,27 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] [[package]] name = "criterion" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ "atty", - "cast", + "cast 0.3.0", "clap", "criterion-plot", "csv", @@ -502,40 +515,40 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ - "cast", + "cast 0.2.7", "itertools", ] [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.16", ] [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.16", ] [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", - "lazy_static", + "crossbeam-utils 0.8.16", "memoffset", "scopeguard", ] @@ -546,18 +559,17 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.0.1", + "autocfg", "cfg-if 0.1.10", ] [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", - "lazy_static", ] [[package]] @@ -566,36 +578,41 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "cssparser" -version = "0.25.9" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe18ca4efb9ba3716c6da66cc3d7e673bf59fa576353011f48c4cfddbdd740e" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" dependencies = [ - "autocfg 0.1.7", "cssparser-macros", "dtoa-short", - "itoa", + "itoa 0.4.8", "matches", "phf", "proc-macro2", - "procedural-masquerade", "quote", - "smallvec 0.6.14", - "syn", + "smallvec", + "syn 1.0.109", ] [[package]] name = "cssparser-macros" -version = "0.3.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb1c84e87c717666564ec056105052331431803d606bd45529b28547b611eef" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ - "phf_codegen", - "proc-macro2", - "procedural-masquerade", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -604,9 +621,9 @@ version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ - "bstr", + "bstr 0.2.17", "csv-core", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] @@ -621,66 +638,23 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "derivative" -version = "2.2.0" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ + "convert_case", "proc-macro2", "quote", - "syn", + "rustc_version", + "syn 1.0.109", ] [[package]] name = "diff" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] name = "difference" @@ -690,11 +664,12 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "digest" -version = "0.8.1" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "generic-array", + "block-buffer", + "crypto-common", ] [[package]] @@ -768,15 +743,15 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "ena" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" dependencies = [ "log", ] @@ -798,9 +773,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -810,16 +785,30 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.9.0" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -834,9 +823,9 @@ dependencies = [ [[package]] name = "expect-test" -version = "1.1.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2300477aab3a378f2ca00a4fbd4dc713654ab7ed790e4017493cb33656280633" +checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" dependencies = [ "dissimilar", "once_cell", @@ -860,15 +849,15 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] [[package]] -name = "fake-simd" -version = "0.1.2" +name = "fastrand" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "filetime" @@ -878,21 +867,15 @@ checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.10", "winapi", ] [[package]] name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - -[[package]] -name = "fixedbitset" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fnv" @@ -917,19 +900,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "frunk_core" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1246cf43ec80bf8b2505b5c360b8fb999c97dabd17dbb604d85558d5cbc25482" +checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" [[package]] name = "fuchsia-cprng" @@ -945,9 +927,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -960,9 +942,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -970,15 +952,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -987,42 +969,39 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "autocfg 1.0.1", - "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ - "autocfg 1.0.1", "futures 0.1.31", "futures-channel", "futures-core", @@ -1033,8 +1012,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -1049,11 +1026,12 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", + "version_check", ] [[package]] @@ -1067,20 +1045,31 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "gimli" -version = "0.25.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glob" @@ -1101,9 +1090,9 @@ dependencies = [ "compiletest_rs", "criterion", "either", - "env_logger 0.9.0", + "env_logger", "expect-test", - "futures 0.3.17", + "futures 0.3.28", "gluon-salsa", "gluon_base", "gluon_check", @@ -1123,8 +1112,8 @@ dependencies = [ "pretty_assertions", "pulldown-cmark 0.8.0", "quick-error 2.0.1", - "rand 0.8.4", - "rand_xorshift 0.3.0", + "rand 0.8.5", + "rand_xorshift", "regex", "serde", "serde_derive", @@ -1152,13 +1141,13 @@ dependencies = [ "futures-channel", "futures-util", "gluon-salsa-macros", - "indexmap", + "indexmap 1.7.0", "lock_api", "log", "oorandom", "parking_lot", "rustc-hash", - "smallvec 1.7.0", + "smallvec", ] [[package]] @@ -1170,7 +1159,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1178,13 +1167,13 @@ name = "gluon_base" version = "0.18.0" dependencies = [ "anymap", - "bitflags", + "bitflags 1.3.2", "codespan", "codespan-reporting", "collect-mac", "compiletest_rs", "either", - "env_logger 0.9.0", + "env_logger", "fnv", "gluon_codegen", "hashbrown 0.11.2", @@ -1198,7 +1187,7 @@ dependencies = [ "serde_derive", "serde_derive_state", "serde_state", - "smallvec 1.7.0", + "smallvec", "typed-arena", "vec_map", ] @@ -1207,7 +1196,7 @@ dependencies = [ name = "gluon_c-api" version = "0.18.0" dependencies = [ - "futures 0.3.17", + "futures 0.3.28", "gluon", "libc", ] @@ -1221,7 +1210,7 @@ dependencies = [ "collect-mac", "difference", "ena", - "env_logger 0.9.0", + "env_logger", "gluon_base", "gluon_codegen", "gluon_format", @@ -1233,7 +1222,7 @@ dependencies = [ "pretty_assertions", "quick-error 2.0.1", "rpds", - "smallvec 1.7.0", + "smallvec", "strsim 0.10.0", ] @@ -1241,14 +1230,14 @@ dependencies = [ name = "gluon_codegen" version = "0.18.0" dependencies = [ - "env_logger 0.9.0", + "env_logger", "gluon", "gluon_vm", "proc-macro2", "quote", "serde", "serde_derive", - "syn", + "syn 1.0.109", ] [[package]] @@ -1258,7 +1247,7 @@ dependencies = [ "codespan", "collect-mac", "either", - "env_logger 0.9.0", + "env_logger", "gluon_base", "gluon_check", "gluon_parser", @@ -1275,11 +1264,11 @@ dependencies = [ "anyhow", "cargo-deadlinks", "clap", - "env_logger 0.9.0", - "futures 0.3.17", + "env_logger", + "futures 0.3.28", "gluon", "gluon_completion", - "handlebars 4.1.3", + "handlebars 4.3.7", "itertools", "lazy_static", "log", @@ -1301,9 +1290,9 @@ version = "0.18.0" dependencies = [ "codespan", "difference", - "env_logger 0.9.0", + "env_logger", "expect-test", - "futures 0.3.17", + "futures 0.3.28", "gluon", "gluon_base", "itertools", @@ -1324,7 +1313,7 @@ dependencies = [ "collect-mac", "criterion", "difference", - "env_logger 0.9.0", + "env_logger", "gluon_base", "itertools", "lalrpop", @@ -1339,14 +1328,14 @@ dependencies = [ name = "gluon_repl" version = "0.18.0" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "anyhow", "app_dirs2", "clap", "codespan", "codespan-reporting", - "env_logger 0.9.0", - "futures 0.3.17", + "env_logger", + "futures 0.3.28", "gluon", "gluon_codegen", "gluon_completion", @@ -1371,16 +1360,16 @@ name = "gluon_vm" version = "0.18.0" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "codespan", "codespan-reporting", "collect-mac", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.16", "difference", "downcast-rs", - "env_logger 0.9.0", + "env_logger", "frunk_core", - "futures 0.3.17", + "futures 0.3.28", "gluon", "gluon_base", "gluon_check", @@ -1392,7 +1381,7 @@ dependencies = [ "log", "ordered-float", "parking_lot", - "petgraph 0.6.0", + "petgraph", "pretty", "pretty_assertions", "quick-error 2.0.1", @@ -1403,7 +1392,7 @@ dependencies = [ "serde_json", "serde_state", "slab", - "smallvec 1.7.0", + "smallvec", "tokio", "typed-arena", ] @@ -1432,16 +1421,16 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.1.3" +version = "4.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b09e2322d20d14bc2572401ce7c1d60b4748580a76c230ed9c1f8938f0c833" +checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -1459,9 +1448,24 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.3.3" @@ -1480,22 +1484,28 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + [[package]] name = "http" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.9", ] [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1504,15 +1514,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1522,9 +1532,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.13" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1534,28 +1544,21 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", + "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", "want", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -1566,23 +1569,31 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ - "autocfg 1.0.1", + "autocfg", "hashbrown 0.11.2", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "insta" -version = "1.8.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15226a375927344c78d39dc6b49e2d5562a5b0705e26a589093c6792e52eed8e" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console", "lazy_static", - "serde", - "serde_json", - "serde_yaml", + "linked-hash-map", "similar", - "uuid", + "yaml-rust", ] [[package]] @@ -1594,11 +1605,22 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.2", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1609,18 +1631,26 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + [[package]] name = "jni" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", + "cfg-if 1.0.0", "combine", "jni-sys", "log", "thiserror", "walkdir", + "windows-sys 0.45.0", ] [[package]] @@ -1631,30 +1661,29 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lalrpop" -version = "0.19.6" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15174f1c529af5bf1283c3bc0058266b483a67156f79589fab2a25e23cf8988" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" dependencies = [ "ascii-canvas", - "atty", "bit-set", "diff", "ena", + "is-terminal", "itertools", "lalrpop-util", - "petgraph 0.5.1", - "pico-args 0.4.2", + "petgraph", "regex", - "regex-syntax", + "regex-syntax 0.6.29", "string_cache", "term", "tiny-keccak", @@ -1663,9 +1692,9 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.6" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e58cce361efcc90ba8a0a5f982c741ff86b603495bb15a998412e957dcd278" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" dependencies = [ "regex", ] @@ -1684,15 +1713,21 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.103" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "little-skeptic" @@ -1723,85 +1758,75 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lol_html" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169299b3b58aa5cd8ad25fd8fe984e93748046d24c80f05aaadd9022f95423ec" +checksum = "3334b64837c6ea62ca7d8c3ba04ca7aa921b307b664002b882e14332ee2f80f1" dependencies = [ - "bitflags", - "cfg-if 0.1.10", + "bitflags 2.4.0", + "cfg-if 1.0.0", "cssparser", "encoding_rs", + "hashbrown 0.13.2", "lazy_static", "lazycell", "memchr", + "mime", "safemem", "selectors", "thiserror", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "matches" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" -version = "2.4.1" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg 1.0.1", ] [[package]] name = "mio" -version = "0.7.13" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] @@ -1815,9 +1840,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -1832,49 +1857,10 @@ dependencies = [ ] [[package]] -name = "ndk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" -dependencies = [ - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-glue" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndk-sys" -version = "0.2.1" +name = "ndk-context" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "new_debug_unreachable" @@ -1888,7 +1874,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 0.1.10", "libc", @@ -1901,70 +1887,39 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.2", "libc", ] -[[package]] -name = "num_enum" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "object" -version = "0.26.2" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.8.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -1972,19 +1927,13 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opener" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" +checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" dependencies = [ - "bstr", + "bstr 1.6.2", "winapi", ] @@ -1994,7 +1943,7 @@ version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -2014,7 +1963,7 @@ version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" dependencies = [ - "autocfg 1.0.1", + "autocfg", "cc", "libc", "pkg-config", @@ -2023,22 +1972,13 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.8.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c9d06878b3a851e8026ef94bf7fef9ba93062cd412601da4d9cf369b1cc62d" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" dependencies = [ "num-traits", ] -[[package]] -name = "output_vt100" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" -dependencies = [ - "winapi", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -2059,31 +1999,33 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", - "smallvec 1.7.0", + "redox_syscall 0.2.10", + "smallvec", "winapi", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.1.3" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ + "memchr", + "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.1.0" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" dependencies = [ "pest", "pest_generator", @@ -2091,84 +2033,81 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.1.3" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "pest_meta" -version = "2.1.3" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" dependencies = [ - "maplit", + "once_cell", "pest", - "sha-1", -] - -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset 0.2.0", - "indexmap", + "sha2", ] [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ - "fixedbitset 0.4.0", - "indexmap", + "fixedbitset", + "indexmap 2.0.0", ] [[package]] name = "phf" -version = "0.7.24" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared 0.7.24", + "phf_macros", + "phf_shared", + "proc-macro-hack", ] [[package]] name = "phf_codegen" -version = "0.7.24" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ "phf_generator", - "phf_shared 0.7.24", + "phf_shared", ] [[package]] name = "phf_generator" -version = "0.7.24" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared 0.7.24", - "rand 0.6.5", + "phf_shared", + "rand 0.7.3", ] [[package]] -name = "phf_shared" -version = "0.7.24" +name = "phf_macros" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" dependencies = [ - "siphasher 0.2.3", + "phf_generator", + "phf_shared", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -2177,7 +2116,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ - "siphasher 0.3.7", + "siphasher", ] [[package]] @@ -2186,17 +2125,11 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" -[[package]] -name = "pico-args" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" - [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2206,9 +2139,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.20" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plotters" @@ -2240,9 +2173,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precomputed-hash" @@ -2262,33 +2195,12 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.0.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ansi_term 0.12.1", - "ctor", "diff", - "output_vt100", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" -dependencies = [ - "thiserror", - "toml", + "yansi", ] [[package]] @@ -2300,7 +2212,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -2321,34 +2233,22 @@ version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ - "unicode-xid", + "unicode-ident", ] -[[package]] -name = "procedural-masquerade" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1383dff4092fe903ac180e391a8d4121cc48f08ccf850614b0290c6673b69d" - [[package]] name = "pulldown-cmark" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] @@ -2359,7 +2259,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", @@ -2379,9 +2279,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2401,43 +2301,37 @@ dependencies = [ [[package]] name = "rand" -version = "0.6.5" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "autocfg 0.1.7", + "getrandom 0.1.16", "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", "rand_pcg", - "rand_xorshift 0.1.1", - "winapi", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", + "rand_core 0.6.4", ] [[package]] name = "rand_chacha" -version = "0.1.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -2447,7 +2341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2467,82 +2361,38 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_core" -version = "0.6.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.16", ] [[package]] -name = "rand_hc" -version = "0.1.0" +name = "rand_core" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "rand_core 0.3.1", + "getrandom 0.2.10", ] [[package]] name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", + "rand_core 0.5.1", ] [[package]] name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "rand_core 0.3.1", + "rand_core 0.5.1", ] [[package]] @@ -2551,31 +2401,28 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg 1.0.1", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.5", - "lazy_static", + "crossbeam-utils 0.8.16", "num_cpus", ] @@ -2594,7 +2441,16 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -2603,19 +2459,20 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.10", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -2624,11 +2481,28 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +[[package]] +name = "regex-automata" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "remove_dir_all" @@ -2677,9 +2551,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" @@ -2693,7 +2567,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.4", + "semver 1.0.18", ] [[package]] @@ -2708,24 +2582,56 @@ dependencies = [ "serde_json", ] +[[package]] +name = "rustix" +version = "0.38.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + [[package]] name = "rustls" -version = "0.19.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ - "base64", "log", "ring", + "rustls-webpki 0.101.4", "sct", - "webpki", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.5" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" @@ -2747,9 +2653,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -2768,25 +2674,24 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ "ring", "untrusted", @@ -2798,7 +2703,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2817,12 +2722,13 @@ dependencies = [ [[package]] name = "selectors" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b86b100bede4f651059740afc3b6cb83458d7401cb7c1ad96d8a11e91742c86" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", + "derive_more", "fxhash", "log", "matches", @@ -2830,7 +2736,7 @@ dependencies = [ "phf_codegen", "precomputed-hash", "servo_arc", - "smallvec 0.6.14", + "smallvec", "thin-slice", ] @@ -2840,46 +2746,30 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", + "semver-parser", "serde", ] [[package]] name = "semver" -version = "0.11.0" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ - "semver-parser 0.10.2", "serde", ] -[[package]] -name = "semver" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" - [[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.130" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -2896,13 +2786,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -2913,16 +2803,16 @@ checksum = "4bda1ea9a4f7c5304e85a1d878457087121ee7be0bef4a3315c14827325e8b12" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.68" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ - "itoa", + "itoa 1.0.9", "ryu", "serde", ] @@ -2936,18 +2826,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" -dependencies = [ - "dtoa", - "indexmap", - "serde", - "yaml-rust", -] - [[package]] name = "servo_arc" version = "0.1.1" @@ -2959,15 +2837,14 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.8.2" +name = "sha2" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ - "block-buffer", + "cfg-if 1.0.0", + "cpufeatures", "digest", - "fake-simd", - "opaque-debug", ] [[package]] @@ -2981,53 +2858,51 @@ dependencies = [ [[package]] name = "similar" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" - -[[package]] -name = "siphasher" -version = "0.2.3" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "siphasher" -version = "0.3.7" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" - -[[package]] -name = "smallvec" -version = "0.6.14" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "maybe-uninit", + "autocfg", ] [[package]] name = "smallvec" -version = "1.7.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "spin" version = "0.5.2" @@ -3054,7 +2929,7 @@ checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared 0.8.0", + "phf_shared", "precomputed-hash", ] @@ -3064,12 +2939,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -3078,9 +2947,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.23" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ "clap", "lazy_static", @@ -3089,26 +2958,37 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "syn" -version = "1.0.77" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] @@ -3119,7 +2999,7 @@ checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -3135,16 +3015,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "libc", - "rand 0.8.4", - "redox_syscall", - "remove_dir_all", - "winapi", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -3153,7 +3032,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef22e194e5ecea16a52a1b75a5de07a6fcb78321d47626d0dfbb1b92492b32e5" dependencies = [ - "futures 0.3.17", + "futures 0.3.28", "num_cpus", "structopt", "structopt-derive", @@ -3174,23 +3053,13 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "tester" version = "0.9.0" @@ -3221,22 +3090,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.29" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.29" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -3260,52 +3129,52 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.12.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg 1.0.1", + "backtrace", "libc", "mio", "num_cpus", - "once_cell", "pin-project-lite", "signal-hook-registry", + "socket2 0.5.3", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.4.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "154794c8f499c2619acd19e839294703e9e32e7630ef5f46ea80d4ef0fbee5eb" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -3322,26 +3191,17 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.28" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -3350,36 +3210,36 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.20" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typed-arena" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicase" @@ -3392,36 +3252,42 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" @@ -3431,29 +3297,27 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.2.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3131cd6cb18488da91da1d10ed31e966f453c06b65bf010d35638456976a3fd7" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ "base64", - "chunked_transfer", "log", "once_cell", "rustls", + "rustls-webpki 0.100.2", "url", - "webpki", "webpki-roots", ] [[package]] name = "url" -version = "2.2.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -3463,12 +3327,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - [[package]] name = "vcpkg" version = "0.2.15" @@ -3483,9 +3341,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "void" @@ -3495,36 +3353,40 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[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", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -3532,24 +3394,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3557,50 +3419,40 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.21.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki 0.100.2", ] [[package]] @@ -3634,11 +3486,143 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "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]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "xdg" -version = "2.2.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "yaml-rust" @@ -3648,3 +3632,9 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/Cargo.toml b/Cargo.toml index be41bd57f..db408233e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,26 +5,26 @@ authors = ["Markus "] keywords = ["script", "scripting", "language"] build = "build.rs" edition = "2018" - + license = "MIT" - + description = "A static, type inferred programming language for application embedding" readme = "README.md" - + homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" - + [badges] travis-ci = { repository = "gluon-lang/gluon" } - + [workspace] members = ["c-api", "repl", "completion", "format", "doc", "codegen"] - + [lib] name = "gluon" path = "src/lib.rs" - + [dependencies] gluon_base = { path = "base", version = "0.18.0" } # GLUON gluon_check = { path = "check", version = "0.18.0" } # GLUON @@ -32,123 +32,123 @@ gluon_parser = { path = "parser", version = "0.18.0" } # GLUON gluon_codegen = { path = "codegen", version = "0.18.0" } # GLUON gluon_vm = { path = "vm", version = "0.18.0", default-features = false } # GLUON gluon_format = { path = "format", version = "0.18.0", default-features = false } # GLUON - -async-trait = "0.1.51" -log = "0.4.14" + +async-trait = "0.1.73" +log = "0.4.20" quick-error = "2.0.1" collect-mac = "0.1.0" -either = "1.6.1" -itertools = "0.10.1" -futures = { version = "0.3.17", default-features = false } +either = "1.9.0" +itertools = "0.10.5" +futures = { version = "0.3.28", default-features = false } codespan = "0.11.1" codespan-reporting = "0.11.1" -pin-project-lite = { version = "0.2.7", optional = true } +pin-project-lite = { version = "0.2.13", optional = true } salsa = { version = "0.15.2", package = "gluon-salsa" } - -serde = { version = "1.0.130", optional = true } + +serde = { version = "1.0.188", optional = true } serde_state = { version = "0.4.8", optional = true } serde_derive_state = { version = "0.4.10", optional = true } - -tokio = { version = "1.12.0", features = ["sync", "rt"], optional = true } + +tokio = { version = "1.32.0", features = ["sync", "rt"], optional = true } tokio-stream = { version = "0.1", features = ["net"], optional = true } - + # Binding crates -regex = { version = "1.5.5", optional = true } +regex = { version = "1.9.4", optional = true } # web -tower-service = { version = "0.3.1", optional = true } -http = { version = "0.2.5", optional = true } -hyper = { version = "0.14.13", optional = true, features = ["stream", "client", "server", "http1", "tcp"] } -native-tls = { version = "0.2.8", optional = true } -tokio-native-tls = { version = "0.3.0", optional = true } - +tower-service = { version = "0.3.2", optional = true } +http = { version = "0.2.9", optional = true } +hyper = { version = "0.14.27", optional = true, features = ["stream", "client", "server", "http1", "tcp"] } +native-tls = { version = "0.2.11", optional = true } +tokio-native-tls = { version = "0.3.1", optional = true } + # Crates used in testing -compiletest_rs = { version = "0.7.0", optional = true } - +compiletest_rs = { version = "0.7.1", optional = true } + [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -rand = { version = "0.8.4", optional = true } +rand = { version = "0.8.5", optional = true } rand_xorshift = { version = "0.3.0", optional = true } - + [build-dependencies] gluon_base = { path = "base", version = "0.18.0" } # GLUON - -itertools = "0.10.1" + +itertools = "0.10.5" little-skeptic = { version = "0.15.2", optional = true } -walkdir = "2.3.2" - +walkdir = "2.3.3" + [dev-dependencies] -anyhow = "1.0.44" -criterion = "0.3.5" +anyhow = "1.0.75" +criterion = "0.3.6" collect-mac = "0.1.0" -env_logger = "0.9.0" -expect-test = "1.1.0" -thiserror = "1.0.29" -insta = "1.8.0" -pretty_assertions = "1.0.0" -structopt = "0.3.23" -tempfile = "3.2.0" +env_logger = "0.9.3" +expect-test = "1.4.1" +thiserror = "1.0.47" +insta = "1.31.0" +pretty_assertions = "1.4.0" +structopt = "0.3.26" +tempfile = "3.8.0" tensile = { version = "0.7", features = ["tokio"] } -tokio = { version = "1.12.0", features = ["macros", "rt-multi-thread", "fs"] } -walkdir = "2.3.2" - -serde = "1.0.130" -serde_derive = "1.0.130" +tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread", "fs"] } +walkdir = "2.3.3" + +serde = "1.0.188" +serde_derive = "1.0.188" serde_derive_state = "0.4.10" -serde_json = "1.0.68" +serde_json = "1.0.105" bincode = "1.3.3" - + pulldown-cmark = "0.8.0" - + gluon_completion = { path = "completion", version = "0.18.0" } # GLUON gluon_codegen = { path = "codegen", version = "0.18.0" } # GLUON - + [features] default = ["async", "regex", "random"] async = ["tokio"] random = ["rand", "rand_xorshift"] serialization = ["serde", "serde_state", "serde_derive_state", "gluon_vm/serialization"] web = ["async", "hyper", "http", "tower-service", "native-tls", "tokio/net", "tokio-stream", "tokio-native-tls", "pin-project-lite"] - + docs_rs = ["serialization"] - + test = ["serialization", "little-skeptic", "http", "web", "gluon_vm/test"] nightly = ["compiletest_rs", "gluon_base/nightly"] test_nightly = ["test", "nightly"] - + [[bench]] name = "check" harness = false - + [[bench]] name = "function_call" harness = false - + [[bench]] name = "precompiled" harness = false - + [[test]] name = "main" harness = false required-features = ["serialization"] - + [[example]] name = "marshalling" required-features = ["serialization"] - + [[example]] name = "http" path = "examples/http/main.rs" required-features = ["serialization", "web"] - + [[example]] name = "lisp" path = "examples/lisp/main.rs" - + [package.metadata.docs.rs] features = ["docs_rs"] - + [profile.bench] debug = 2 - + [profile.release] debug = 2 diff --git a/base/Cargo.toml b/base/Cargo.toml index b56aaeb8a..8a6f68aaf 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -18,34 +18,34 @@ travis-ci = { repository = "gluon-lang/gluon" } [dependencies] bitflags = "1.3.2" hashbrown = "0.11.2" -log = "0.4.14" +log = "0.4.20" quick-error = "2.0.1" fnv = "1.0.7" pretty = "0.10.0" -smallvec = "1.7.0" +smallvec = "1.11.0" collect-mac = "0.1.0" anymap = { version = "0.12.1", optional = true } -itertools = "0.10.1" -ordered-float = "2.8.0" +itertools = "0.10.5" +ordered-float = "2.10.0" codespan = "0.11.1" codespan-reporting = "0.11.1" -either = "1.6.1" +either = "1.9.0" vec_map = "0.8.2" -typed-arena = "2.0.1" +typed-arena = "2.0.2" gluon_codegen = { version = "0.18.0", path = "../codegen" } # GLUON -serde = { version = "1.0.130", features = ["rc"], optional = true } +serde = { version = "1.0.188", features = ["rc"], optional = true } serde_state = { version = "0.4.8", features = ["rc"], optional = true } -serde_derive = { version = "1.0.130", optional = true } +serde_derive = { version = "1.0.188", optional = true } serde_derive_state = { version = "0.4.10", optional = true } # Crates used in testing -compiletest_rs = { version = "0.7.0", optional = true } +compiletest_rs = { version = "0.7.1", optional = true } [dev-dependencies] -env_logger = "0.9.0" -pretty_assertions = "1.0.0" +env_logger = "0.9.3" +pretty_assertions = "1.4.0" [features] serialization = ["serde", "serde_state", "serde_derive", "serde_derive_state", "anymap"] diff --git a/c-api/Cargo.toml b/c-api/Cargo.toml index 160d926e2..973139837 100644 --- a/c-api/Cargo.toml +++ b/c-api/Cargo.toml @@ -20,10 +20,10 @@ crate-type = ["cdylib"] [dependencies] gluon = { version = "0.18.0", path = ".." } # GLUON -futures = "0.3.17" +futures = "0.3.28" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -libc = "0.2.103" +libc = "0.2.147" [features] test = ["gluon/test"] diff --git a/check/Cargo.toml b/check/Cargo.toml index 4cda10e53..f4abdd0b6 100644 --- a/check/Cargo.toml +++ b/check/Cargo.toml @@ -17,11 +17,11 @@ travis-ci = { repository = "gluon-lang/gluon" } [dependencies] collect-mac = "0.1.0" -ena = "0.14.0" -log = "0.4.14" -itertools = "0.10.1" +ena = "0.14.2" +log = "0.4.20" +itertools = "0.10.5" pretty = "0.10.0" -smallvec = "1.7.0" +smallvec = "1.11.0" rpds = "0.10.0" quick-error = "2.0.1" @@ -34,13 +34,13 @@ gluon_base = { path = "../base", version = "0.18.0" } # GLUON gluon_codegen = { path = "../codegen", version = "0.18.0" } # GLUON [dev-dependencies] -env_logger = "0.9.0" -insta = "1.8.0" +env_logger = "0.9.3" +insta = "1.31.0" gluon_parser = { path = "../parser", version = "0.18.0" } # GLUON gluon_format = { path = "../format", version = ">=0.9" } collect-mac = "0.1.0" difference = "2.0.0" -pretty_assertions = "1.0.0" +pretty_assertions = "1.4.0" diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index af8472348..248a2cb35 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -16,13 +16,13 @@ documentation = "https://docs.rs/gluon" proc-macro = true [dependencies] -syn = { version = "1.0.77", features = ["extra-traits"] } -quote = "1.0.9" -proc-macro2 = "1.0.29" +syn = { version = "1.0.109", features = ["extra-traits"] } +quote = "1.0.33" +proc-macro2 = "1.0.66" [dev-dependencies] -env_logger = "0.9.0" -serde = "1.0.130" -serde_derive = "1.0.130" +env_logger = "0.9.3" +serde = "1.0.188" +serde_derive = "1.0.188" gluon = { version = ">=0.8.0", path = "..", features = ["serialization"] } gluon_vm = { version = ">=0.8.0", path = "../vm" } diff --git a/completion/Cargo.toml b/completion/Cargo.toml index 35fdec321..c13e71ae1 100644 --- a/completion/Cargo.toml +++ b/completion/Cargo.toml @@ -12,17 +12,17 @@ repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" [dependencies] -either = "1.6.1" -itertools = "0.10.1" -walkdir = "2.3.2" +either = "1.9.0" +itertools = "0.10.5" +walkdir = "2.3.3" codespan = "0.11.1" gluon_base = { path = "../base", version = "0.18.0" } # GLUON [dev-dependencies] collect-mac = "0.1.0" -env_logger = "0.9.0" -pretty_assertions = "1.0.0" +env_logger = "0.9.3" +pretty_assertions = "1.4.0" quick-error = "2.0.1" gluon_check = { path = "../check", version = "0.18.0" } # GLUON diff --git a/doc/Cargo.toml b/doc/Cargo.toml index b30dc67a9..23326a0ab 100644 --- a/doc/Cargo.toml +++ b/doc/Cargo.toml @@ -12,29 +12,29 @@ repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" [dependencies] -clap = "2.33.3" -env_logger = "0.9.0" -anyhow = "1.0.44" -futures = "0.3.17" -handlebars = "4.1.3" -itertools = "0.10.1" +clap = "2.34.0" +env_logger = "0.9.3" +anyhow = "1.0.75" +futures = "0.3.28" +handlebars = "4.3.7" +itertools = "0.10.5" lazy_static = "1.4.0" -log = "0.4.14" -opener = "0.5.0" +log = "0.4.20" +opener = "0.5.2" pretty = "0.10.0" pulldown-cmark = "0.8.0" -rayon = "1.5.1" -regex = "1.5.5" -structopt = "0.3.23" -walkdir = "2.3.2" +rayon = "1.7.0" +regex = "1.9.4" +structopt = "0.3.26" +walkdir = "2.3.3" -serde = "1.0.130" -serde_derive = "1.0.130" -serde_json = "1.0.68" +serde = "1.0.188" +serde_derive = "1.0.188" +serde_json = "1.0.105" gluon = { version = "0.18.0", default-features = false, path = ".." } # GLUON completion = { package = "gluon_completion", version = "0.18.0", path = "../completion" } # GLUON [dev-dependencies] -cargo-deadlinks = "0.8.0" +cargo-deadlinks = "0.8.1" diff --git a/format/Cargo.toml b/format/Cargo.toml index 19263ce15..c9cbcf2fb 100644 --- a/format/Cargo.toml +++ b/format/Cargo.toml @@ -12,21 +12,21 @@ repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" [dependencies] -log = "0.4.14" +log = "0.4.20" pretty = "0.10.0" -itertools = "0.10.1" +itertools = "0.10.5" codespan = "0.11.1" gluon_base = { path = "../base", version = "0.18.0" } # GLUON [dev-dependencies] difference = "2.0.0" -env_logger = "0.9.0" -expect-test = "1.1.0" -futures = "0.3.17" -pretty_assertions = "1.0.0" -tokio = { version = "1.12.0", features = ["macros"] } -walkdir = "2.3.2" +env_logger = "0.9.3" +expect-test = "1.4.1" +futures = "0.3.28" +pretty_assertions = "1.4.0" +tokio = { version = "1.32.0", features = ["macros"] } +walkdir = "2.3.3" gluon_base = { path = "../base", version = "0.18.0" } # GLUON gluon = { path = "..", version = ">=0.9" } diff --git a/parser/Cargo.toml b/parser/Cargo.toml index 156901c6c..0748c6502 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -19,23 +19,23 @@ travis-ci = { repository = "gluon-lang/gluon" } [dependencies] collect-mac = "0.1.0" -itertools = "0.10.1" +itertools = "0.10.5" quick-error = "2.0.1" -lalrpop-util = "0.19.6" -log = "0.4.14" +lalrpop-util = "0.19.12" +log = "0.4.20" gluon_base = { path = "../base", version = "0.18.0" } # GLUON -ordered-float = "2.8.0" +ordered-float = "2.10.0" codespan = "0.11.1" codespan-reporting = "0.11.1" [dev-dependencies] -criterion = "0.3.5" -env_logger = "0.9.0" +criterion = "0.3.6" +env_logger = "0.9.3" difference = "2.0.0" -pretty_assertions = "1.0.0" +pretty_assertions = "1.4.0" [build-dependencies] -lalrpop = "0.19.6" +lalrpop = "0.19.12" [[bench]] name = "parser" diff --git a/repl/Cargo.toml b/repl/Cargo.toml index d32ae2b99..aff47db2c 100644 --- a/repl/Cargo.toml +++ b/repl/Cargo.toml @@ -27,30 +27,30 @@ gluon_codegen = { path = "../codegen", version = "0.18.0" } # GLUON gluon_format = { version = "0.18.0", path = "../format" } # GLUON gluon_doc = { version = "0.18.0", path = "../doc" } # GLUON -app_dirs = { package = "app_dirs2", version = "2.3.2" } -anyhow = "1.0.44" -futures = "0.3.17" -tokio = { version = "1.12.0", features = ["rt-multi-thread", "macros", "signal"] } -clap = "2.33.3" -structopt = "0.3.23" -log = "0.4.14" -env_logger = { version = "0.9.0", optional = true } +app_dirs = { package = "app_dirs2", version = "2.5.5" } +anyhow = "1.0.75" +futures = "0.3.28" +tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "signal"] } +clap = "2.34.0" +structopt = "0.3.26" +log = "0.4.20" +env_logger = { version = "0.9.3", optional = true } lazy_static = "1.4.0" rustyline = "=6.0.0" -walkdir = "2.3.2" +walkdir = "2.3.3" codespan = "0.11.1" codespan-reporting = "0.11.1" quick-error = "2.0.1" -serde = "1.0.130" -serde_derive = "1.0.130" +serde = "1.0.188" +serde_derive = "1.0.188" [target.'cfg(not(windows))'.dependencies] ansi_term = "0.12.1" [dev-dependencies] -pretty_assertions = "1.0.0" -tokio = "1.12.0" +pretty_assertions = "1.4.0" +tokio = "1.32.0" [target.'cfg(unix)'.dev-dependencies] rexpect = "0.4.0" diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 36238e4f1..0bafa15e5 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -17,33 +17,33 @@ documentation = "https://docs.rs/gluon" travis-ci = { repository = "gluon-lang/gluon" } [dependencies] -async-trait = "0.1.51" +async-trait = "0.1.73" bitflags = "1.3.2" codespan = "0.11.1" codespan-reporting = "0.11.1" collect-mac = "0.1.0" downcast-rs = "1.2.0" difference = { version = "2.0.0", optional = true } -crossbeam-utils = "0.8.5" -frunk_core = "0.4.0" -futures = { version = "0.3.17", features = ["compat", "async-await"] } -itertools = "0.10.1" -lalrpop-util = { version = "0.19.6", optional = true } -log = "0.4.14" -ordered-float = "2.8.0" +crossbeam-utils = "0.8.16" +frunk_core = "0.4.2" +futures = { version = "0.3.28", features = ["compat", "async-await"] } +itertools = "0.10.5" +lalrpop-util = { version = "0.19.12", optional = true } +log = "0.4.20" +ordered-float = "2.10.0" parking_lot = "0.11.2" -petgraph = "0.6.0" +petgraph = "0.6.4" pretty = "0.10.0" quick-error = "2.0.1" -regex = { version = "1.5.4", optional = true } -smallvec = "1.7.0" -slab = "0.4.4" -typed-arena = "2.0.1" +regex = { version = "1.9.4", optional = true } +smallvec = "1.11.0" +slab = "0.4.9" +typed-arena = "2.0.2" -serde = { version = "1.0.130", optional = true } -serde_json = { version = "1.0.68", optional = true } +serde = { version = "1.0.188", optional = true } +serde_json = { version = "1.0.105", optional = true } serde_state = { version = "0.4.8", optional = true } -serde_derive = { version = "1.0.130", optional = true } +serde_derive = { version = "1.0.188", optional = true } serde_derive_state = { version = "0.4.10", optional = true } gluon_base = { path = "../base", version = "0.18.0" } # GLUON @@ -52,21 +52,21 @@ gluon_codegen = { path = "../codegen", version = "0.18.0" } # GLUON gluon_parser = { path = "../parser", version = "0.18.0", optional = true } # GLUON [build-dependencies] -lalrpop = { version = "0.19.6", features = ["lexer"], optional = true } +lalrpop = { version = "0.19.12", features = ["lexer"], optional = true } [dev-dependencies] difference = "2.0.0" -env_logger = "0.9.0" -pretty_assertions = "1.0.0" +env_logger = "0.9.3" +pretty_assertions = "1.4.0" # HACK Trick crates.io into letting letting this be published with a dependency on gluon # (which requires gluon_vm to be published) gluon = { path = "..", version = ">=0.9" } -lalrpop-util = "0.19.6" -regex = "1.5.4" -serde_json = "1.0.68" -tokio = { version = "1.12.0", features = ["macros"] } +lalrpop-util = "0.19.12" +regex = "1.9.4" +serde_json = "1.0.105" +tokio = { version = "1.32.0", features = ["macros"] } gluon_parser = { path = "../parser", version = "0.18.0" } # GLUON From d2562e55e641f6dc7e9827cc7a97612ead200eeb Mon Sep 17 00:00:00 2001 From: rowanfr Date: Wed, 6 Sep 2023 02:28:42 -0500 Subject: [PATCH 03/35] Added should_panic to tests This commit added should_panic to tests which indicated by their context that they should panic given that they have the panic message in the comments. The only issue is not all of them panic but that should be solved in a separate fork --- tests/compiletest.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/compiletest.rs b/tests/compiletest.rs index a3f3f9047..c648d15e2 100644 --- a/tests/compiletest.rs +++ b/tests/compiletest.rs @@ -67,6 +67,7 @@ fn run_mode(mode: &'static str) { } #[test] +#[should_panic] fn compile_test() { let _ = env_logger::try_init(); run_mode("compile-fail"); From d1d4b2af049d0e81f19ff2976e817f2a72fbcf54 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Wed, 6 Sep 2023 02:43:46 -0500 Subject: [PATCH 04/35] Changed appveyor to use nightly This changes appveyor configuration to use the nightly rustc compiler in order to use the recent stable-to-stable regression to compile --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4e6e921ca..6e1e23a68 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ environment: CARGO_HTTP_CHECK_REVOKE: false matrix: - TARGET: x86_64-pc-windows-msvc - CHANNEL: stable + CHANNEL: nightly # Install Rust and Cargo # (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml) @@ -53,10 +53,10 @@ deploy: auth_token: secure: 0fkZyK+5fQgQVFWFTVCFwrZJDp8aAaMJorsgNZd8YF0aasbd7hWC8EUVCL5YSNuc provider: GitHub - # deploy when a new tag is pushed and only on the stable channel + # deploy when a new tag is pushed and only on the nightly channel on: # channel to use to produce the release artifacts - CHANNEL: stable + CHANNEL: nightly appveyor_repo_tag: true branches: From efda45ac8d3a5217cc3c5d4f6ed80437c2d3f216 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Wed, 6 Sep 2023 04:17:34 -0500 Subject: [PATCH 05/35] Removed stable from github actions Temporarily removed stable as a rust option for github actions. This should be reverted when 1.74 is made the rustc stable version and is only due to the ICE error being presently resolved in nightly. This leads to some clear instability with nightly features, but it's currently the only option --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e09749acc..0c8ed834a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [stable, nightly] + rust: [nightly] # This should be reverted back to [stable, nightly] when 1.74 is made the rustc stable version env: CRATE_NAME: gluon CARGO_INCREMENTAL: 0 # Incremental compilation is slower and bloats the cache From 152491322ce083c36d80047a72cafbb8221ecf36 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Wed, 6 Sep 2023 05:48:14 -0500 Subject: [PATCH 06/35] Removed the stable requirement Removed the stable requirement from .travis.yml for the rustc compiler --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a1eb45cd..a010009b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: include: - rust: nightly-2020-09-12 # - rust: beta - - rust: stable + # - rust: stable Removed # This should be uncommented when 1.74 is made the rustc stable version env: ARCH=i686 - rust: stable From 88f1e88eeb44cbd391691f96bca45d0dc908552c Mon Sep 17 00:00:00 2001 From: rowanfr Date: Wed, 6 Sep 2023 05:54:34 -0500 Subject: [PATCH 07/35] Updated nightly version in .travis.yml Updated nightly version in .travis.yml and fixed errors in previous commit regarding using solely the nightly version of rustc --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a010009b9..37de443f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,18 +18,18 @@ branches: matrix: include: - - rust: nightly-2020-09-12 + - rust: nightly-2023-09-05 # - rust: beta # - rust: stable Removed # This should be uncommented when 1.74 is made the rustc stable version env: ARCH=i686 - - rust: stable + - rust: nightly-2023-09-05 # Change back to rust: stable when 1.74 is made the rustc stable version env: - DEPLOY=1 - PUBLISH=1 - TARGET=x86_64-unknown-linux-gnu - - rust: nightly-2020-09-12 + - rust: nightly-2023-09-05 env: WASM=1 # Only for deployment @@ -122,7 +122,7 @@ deploy: after_deploy: - CURRENT_TAG=`git describe --exact-match --abbrev=0 --tags || true` - > - if [[ $CURRENT_TAG != "" ]] && [[ $TRAVIS_RUST_VERSION == "stable" ]] && [[ $PUBLISH == "1" ]]; then + if [[ $CURRENT_TAG != "" ]] && [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $PUBLISH == "1" ]]; then cargo login $CRATES_IO_TOKEN ./scripts/publish.sh "${CURRENT_TAG}" fi From 01b0f85eab124d07474d9cdeb120427e25f571da Mon Sep 17 00:00:00 2001 From: rowanfr Date: Thu, 7 Sep 2023 21:56:57 -0500 Subject: [PATCH 08/35] Updated sccache to use v0.5.4 Updated sccache install script to use version v0.5.4 --- scripts/install_sccache.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/install_sccache.sh b/scripts/install_sccache.sh index f3e45de24..9ddc5774a 100755 --- a/scripts/install_sccache.sh +++ b/scripts/install_sccache.sh @@ -25,15 +25,20 @@ function cleanup { # register the cleanup function to be called on the EXIT signal trap cleanup EXIT +# Sample links +# https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-dist-v0.5.4-x86_64-unknown-linux-musl.tar.gz +# https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-v0.5.4-aarch64-apple-darwin.tar.gz + +VERSION="v0.5.4" if [[ $1 == *"apple"* ]]; then TARGET=$1 + SCCACHE_VERSION="sccache-${VERSION}-aarch64-${TARGET}-darwin" else TARGET='x86_64-unknown-linux-musl' + SCCACHE_VERSION="sccache-dist-${VERSION}-${TARGET}" fi -VERSION="0.2.10" -SCCACHE_VERSION="sccache-${VERSION}-${TARGET}" pushd ${WORK_DIR} curl -L "https://github.com/mozilla/sccache/releases/download/${VERSION}/$SCCACHE_VERSION.tar.gz" | tar -xvz From 9a157081652c70bad841187daee7328007fdf99f Mon Sep 17 00:00:00 2001 From: rowanfr Date: Thu, 7 Sep 2023 23:29:00 -0500 Subject: [PATCH 09/35] Update sccache script to reflect tar internals --- scripts/install_sccache.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install_sccache.sh b/scripts/install_sccache.sh index 9ddc5774a..84782e5b2 100755 --- a/scripts/install_sccache.sh +++ b/scripts/install_sccache.sh @@ -42,7 +42,8 @@ fi pushd ${WORK_DIR} curl -L "https://github.com/mozilla/sccache/releases/download/${VERSION}/$SCCACHE_VERSION.tar.gz" | tar -xvz -mv $SCCACHE_VERSION/sccache . +mv $SCCACHE_VERSION/sccache* . +# it is sccache-dist on linux and sccache on mac chmod +x ./sccache mv ./sccache $HOME/bin/ From db088b00d35335b41afa4917fc26022596e91b85 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Thu, 7 Sep 2023 23:33:04 -0500 Subject: [PATCH 10/35] Incorporate the rename of sccache in the mv --- scripts/install_sccache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_sccache.sh b/scripts/install_sccache.sh index 84782e5b2..95a1d33b7 100755 --- a/scripts/install_sccache.sh +++ b/scripts/install_sccache.sh @@ -42,7 +42,7 @@ fi pushd ${WORK_DIR} curl -L "https://github.com/mozilla/sccache/releases/download/${VERSION}/$SCCACHE_VERSION.tar.gz" | tar -xvz -mv $SCCACHE_VERSION/sccache* . +mv $SCCACHE_VERSION/sccache* ./sccache # it is sccache-dist on linux and sccache on mac chmod +x ./sccache mv ./sccache $HOME/bin/ From dbef05ed9ca0896338121c6314587f348d5e108c Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 00:13:14 -0500 Subject: [PATCH 11/35] Alternate install for cross --- scripts/install_cross.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index fd84a5032..9ce975c8f 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,20 +1,8 @@ set -ex main() { - local target=x86_64-unknown-linux-musl - - # This fetches latest stable release - local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ - | cut -d/ -f3 \ - | grep -E '^v[0.1.0-9.]+$' \ - | sort --version-sort \ - | tail -n1) - curl -LSfs https://japaric.github.io/trust/install.sh | \ - sh -s -- \ - --force \ - --git japaric/cross \ - --tag $tag \ - --target $target + # At this point cargo should be installed + cargo install cross } main From 18ae8fe31a71bbdf4bbe1ee2fdaa99a91e8ec126 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 00:17:11 -0500 Subject: [PATCH 12/35] Clean cargo of artifacts --- scripts/install_cross.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 9ce975c8f..ec6791d58 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,6 +1,8 @@ set -ex main() { + # clean cargo of any stored artifacts + cargo clean # At this point cargo should be installed cargo install cross } From cc3d8da0bc770b83bb3715a196dd30c26a89909c Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 00:21:06 -0500 Subject: [PATCH 13/35] Clear tmp file recursively Clear tmp file recursively to prevent cargo artifacts from interfering --- scripts/install_cross.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index ec6791d58..bfcf957b0 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,6 +1,8 @@ set -ex main() { + # clean tmp of any stored artifacts + rm -r tmp/* # clean cargo of any stored artifacts cargo clean # At this point cargo should be installed From 05436805b0c1c43ecdd97e5367da79fea7465b84 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 00:21:43 -0500 Subject: [PATCH 14/35] Added the first backslash for /tmp --- scripts/install_cross.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index bfcf957b0..9d4621755 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -2,7 +2,7 @@ set -ex main() { # clean tmp of any stored artifacts - rm -r tmp/* + rm -r /tmp/* # clean cargo of any stored artifacts cargo clean # At this point cargo should be installed From 7dd900b2b43d11f97060d2366be350174e816b32 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 04:26:05 -0500 Subject: [PATCH 15/35] Attempting to fix cross installation errors --- scripts/install_cross.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 9d4621755..53b6bca33 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,10 +1,8 @@ set -ex main() { - # clean tmp of any stored artifacts - rm -r /tmp/* - # clean cargo of any stored artifacts - cargo clean + # This is necissary as shown in https://github.com/rust-lang/rust/issues/61925 + export RUSTC_WRAPPER=sccache # At this point cargo should be installed cargo install cross } From f6c1bc2f12d81e7ace022d2b0e2a9af9c0b9b336 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 04:46:10 -0500 Subject: [PATCH 16/35] Testing if pure rust nightly will fix build issues --- .travis.yml | 6 +++--- scripts/install_cross.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37de443f8..762cd89a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,18 +18,18 @@ branches: matrix: include: - - rust: nightly-2023-09-05 + - rust: nightly # - rust: beta # - rust: stable Removed # This should be uncommented when 1.74 is made the rustc stable version env: ARCH=i686 - - rust: nightly-2023-09-05 # Change back to rust: stable when 1.74 is made the rustc stable version + - rust: nightly # Change back to rust: stable when 1.74 is made the rustc stable version env: - DEPLOY=1 - PUBLISH=1 - TARGET=x86_64-unknown-linux-gnu - - rust: nightly-2023-09-05 + - rust: nightly env: WASM=1 # Only for deployment diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 53b6bca33..d9b61ae1d 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,7 +1,7 @@ set -ex main() { - # This is necissary as shown in https://github.com/rust-lang/rust/issues/61925 + # This is necessary as shown in https://github.com/rust-lang/rust/issues/61925 export RUSTC_WRAPPER=sccache # At this point cargo should be installed cargo install cross From 7bfcbfe70a9129a1411ffd383dffd66ea51868bc Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 04:50:40 -0500 Subject: [PATCH 17/35] Trying to do a basic log of the toolchains installed via CI --- scripts/install_cross.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index d9b61ae1d..9418cf132 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -3,6 +3,9 @@ set -ex main() { # This is necessary as shown in https://github.com/rust-lang/rust/issues/61925 export RUSTC_WRAPPER=sccache + # Check sscache version + ls -a /home/travis/.rustup/toolchains/* + sccache --version # At this point cargo should be installed cargo install cross } From 7c2c68feddaf164cbce02646ff1a401a064da607 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Fri, 8 Sep 2023 04:59:54 -0500 Subject: [PATCH 18/35] Further attempt at debugging --- .travis.yml | 6 +++--- scripts/install_cross.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 762cd89a7..37de443f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,18 +18,18 @@ branches: matrix: include: - - rust: nightly + - rust: nightly-2023-09-05 # - rust: beta # - rust: stable Removed # This should be uncommented when 1.74 is made the rustc stable version env: ARCH=i686 - - rust: nightly # Change back to rust: stable when 1.74 is made the rustc stable version + - rust: nightly-2023-09-05 # Change back to rust: stable when 1.74 is made the rustc stable version env: - DEPLOY=1 - PUBLISH=1 - TARGET=x86_64-unknown-linux-gnu - - rust: nightly + - rust: nightly-2023-09-05 env: WASM=1 # Only for deployment diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 9418cf132..aee0648b2 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -4,7 +4,7 @@ main() { # This is necessary as shown in https://github.com/rust-lang/rust/issues/61925 export RUSTC_WRAPPER=sccache # Check sscache version - ls -a /home/travis/.rustup/toolchains/* + ls -a /home/travis/.rustup/toolchains/*/bin/* sccache --version # At this point cargo should be installed cargo install cross From 1f40c2c0a911ef2527d635a92fbb443690d289e5 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 01:07:14 -0500 Subject: [PATCH 19/35] Revert to download of precompiled binaries for cross --- scripts/install_cross.sh | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index aee0648b2..eec8e8944 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,13 +1,24 @@ set -ex main() { - # This is necessary as shown in https://github.com/rust-lang/rust/issues/61925 - export RUSTC_WRAPPER=sccache - # Check sscache version - ls -a /home/travis/.rustup/toolchains/*/bin/* - sccache --version - # At this point cargo should be installed - cargo install cross + # Sample link + # https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz + + VERSION="v0.2.5" + + CROSS_VERSION='cross-x86_64-unknown-linux-musl' + + pushd ${WORK_DIR} + + curl -L "https://github.com/cross-rs/cross/releases/download/${VERSION}/$CROSS_VERSION.tar.gz" | tar -xvz + mv $CROSS_VERSION/cross . + mv $CROSS_VERSION/cross-util . + + # it is sccache-dist on linux and sccache on mac + chmod +x ./cross + mv ./cross $HOME/bin/ + chmod +x ./cross-util + mv ./cross-util $HOME/bin/ } main From b8c34bd207cd06c4f4152f7081b17d39ca83b5b5 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 01:12:07 -0500 Subject: [PATCH 20/35] Removed pushd inclusion --- scripts/install_cross.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index eec8e8944..9a10f0316 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -8,8 +8,6 @@ main() { CROSS_VERSION='cross-x86_64-unknown-linux-musl' - pushd ${WORK_DIR} - curl -L "https://github.com/cross-rs/cross/releases/download/${VERSION}/$CROSS_VERSION.tar.gz" | tar -xvz mv $CROSS_VERSION/cross . mv $CROSS_VERSION/cross-util . From cb3e40275898565b074b1b11d9f1c46e8b7687a6 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 01:19:48 -0500 Subject: [PATCH 21/35] Placed cross install before sccache --- .travis.yml | 10 +++++----- scripts/install_cross.sh | 17 +---------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37de443f8..55d539535 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,10 @@ branches: matrix: include: - - rust: nightly-2023-09-05 + #- rust: nightly-2023-09-05 # - rust: beta # - rust: stable Removed # This should be uncommented when 1.74 is made the rustc stable version - env: ARCH=i686 + # env: ARCH=i686 - rust: nightly-2023-09-05 # Change back to rust: stable when 1.74 is made the rustc stable version env: @@ -29,8 +29,8 @@ matrix: - PUBLISH=1 - TARGET=x86_64-unknown-linux-gnu - - rust: nightly-2023-09-05 - env: WASM=1 + #- rust: nightly-2023-09-05 + # env: WASM=1 # Only for deployment # - if: tag IS present @@ -56,8 +56,8 @@ before_install: install: - export PATH="$HOME/bin:$PATH" - mkdir -p $HOME/bin - - ./scripts/install_sccache.sh $TARGET - sh scripts/install_cross.sh + - ./scripts/install_sccache.sh $TARGET - source ~/.cargo/env || true - ./scripts/install_mdbook.sh $TARGET diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 9a10f0316..1a3ce38f1 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,22 +1,7 @@ set -ex main() { - # Sample link - # https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz - - VERSION="v0.2.5" - - CROSS_VERSION='cross-x86_64-unknown-linux-musl' - - curl -L "https://github.com/cross-rs/cross/releases/download/${VERSION}/$CROSS_VERSION.tar.gz" | tar -xvz - mv $CROSS_VERSION/cross . - mv $CROSS_VERSION/cross-util . - - # it is sccache-dist on linux and sccache on mac - chmod +x ./cross - mv ./cross $HOME/bin/ - chmod +x ./cross-util - mv ./cross-util $HOME/bin/ + cargo install cross --git https://github.com/cross-rs/cross } main From 56d7fb10da71bcfceda25b083ad91b9e6d741a34 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 01:23:51 -0500 Subject: [PATCH 22/35] Reverted changes --- .travis.yml | 2 +- scripts/install_cross.sh | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55d539535..b37d0dbd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,8 @@ before_install: install: - export PATH="$HOME/bin:$PATH" - mkdir -p $HOME/bin - - sh scripts/install_cross.sh - ./scripts/install_sccache.sh $TARGET + - sh scripts/install_cross.sh - source ~/.cargo/env || true - ./scripts/install_mdbook.sh $TARGET diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 1a3ce38f1..fd84a5032 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -1,7 +1,20 @@ set -ex main() { - cargo install cross --git https://github.com/cross-rs/cross + local target=x86_64-unknown-linux-musl + + # This fetches latest stable release + local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ + | cut -d/ -f3 \ + | grep -E '^v[0.1.0-9.]+$' \ + | sort --version-sort \ + | tail -n1) + curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- \ + --force \ + --git japaric/cross \ + --tag $tag \ + --target $target } main From 41d9ec1c37f27d865202320e399432f62a2d9186 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 01:42:40 -0500 Subject: [PATCH 23/35] Manually alter referenced installer script --- scripts/install.sh | 154 +++++++++++++++++++++++++++++++++++++++ scripts/install_cross.sh | 15 ++-- 2 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 scripts/install.sh diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100644 index 000000000..5f25d2fba --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,154 @@ +#!/bin/sh + +set -e + +help() { + cat <<'EOF' +Install a binary release of a Rust crate hosted on GitHub + +Usage: + install.sh [options] + +Options: + -h, --help Display this message + --git SLUG Get the crate from "https://github/$SLUG" + -f, --force Force overwriting an existing binary + --crate NAME Name of the crate to install (default ) + --tag TAG Tag (version) of the crate to install (default ) + --target TARGET Install the release compiled for $TARGET (default <`rustc` host>) + --to LOCATION Where to install the binary (default ~/.cargo/bin) +EOF +} + +say() { + echo "install.sh: $1" +} + +say_err() { + say "$1" >&2 +} + +err() { + if [ ! -z $td ]; then + rm -rf $td + fi + + say_err "ERROR $1" + exit 1 +} + +need() { + if ! command -v $1 > /dev/null 2>&1; then + err "need $1 (command not found)" + fi +} + +force=false +while test $# -gt 0; do + case $1 in + --crate) + crate=$2 + shift + ;; + --force | -f) + force=true + ;; + --git) + git=$2 + shift + ;; + --help | -h) + help + exit 0 + ;; + --tag) + tag=$2 + shift + ;; + --target) + target=$2 + shift + ;; + --to) + dest=$2 + shift + ;; + *) + ;; + esac + shift +done + +# Dependencies +need basename +need curl +need install +need mkdir +need mktemp +need tar + +# Optional dependencies +if [ -z $crate ] || [ -z $tag ] || [ -z $target ]; then + need cut +fi + +if [ -z $tag ]; then + need rev +fi + +if [ -z $target ]; then + need grep + need rustc +fi + +if [ -z $git ]; then + err 'must specify a git repository using `--git`. Example: `install.sh --git japaric/cross`' +fi + +url="https://github.com/$git" +say_err "GitHub repository: $url" + +if [ -z $crate ]; then + crate=$(echo $git | cut -d'/' -f2) +fi + +say_err "Crate: $crate" + +url="$url/releases" + +if [ -z $tag ]; then + tag=$(curl -s "$url/latest" | cut -d'"' -f2 | rev | cut -d'/' -f1 | rev) + say_err "Tag: latest ($tag)" +else + say_err "Tag: $tag" +fi + +if [ -z $target ]; then + target=$(rustc -Vv | grep host | cut -d' ' -f2) +fi + +say_err "Target: $target" + +if [ -z $dest ]; then + dest="$HOME/.cargo/bin" +fi + +say_err "Installing to: $dest" + +url="$url/download/$tag/$target.tar.gz" + +td=$(mktemp -d || mktemp -d -t tmp) +curl -sL $url | tar -C $td -xz + +for f in $(ls $td); do + test -x $td/$f || continue + + if [ -e "$dest/$f" ] && [ $force = false ]; then + err "$f already exists in $dest" + else + mkdir -p $dest + install -m 755 $td/$f $dest + fi +done + +rm -rf $td diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index fd84a5032..85f79397f 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -2,19 +2,18 @@ set -ex main() { local target=x86_64-unknown-linux-musl - + # https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz # This fetches latest stable release - local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ + local tag=$(git ls-remote --tags --refs --exit-code https://github.com/cross-rs/cross \ | cut -d/ -f3 \ | grep -E '^v[0.1.0-9.]+$' \ | sort --version-sort \ | tail -n1) - curl -LSfs https://japaric.github.io/trust/install.sh | \ - sh -s -- \ - --force \ - --git japaric/cross \ - --tag $tag \ - --target $target + sh ./install.sh -- \ + --force \ + --git cross-rs/cross \ + --tag $tag \ + --target $target } main From c833470fd8c95e034cdfdeed2a696ce4fbbe2ae7 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 01:51:08 -0500 Subject: [PATCH 24/35] Further tests --- scripts/install_cross.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 85f79397f..43332c24d 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -9,7 +9,9 @@ main() { | grep -E '^v[0.1.0-9.]+$' \ | sort --version-sort \ | tail -n1) - sh ./install.sh -- \ + ls -l . + ls ./scripts/* + sh ./scripts/install.sh -- \ --force \ --git cross-rs/cross \ --tag $tag \ From 69a182bd2fa0fd24da34180438e3e62bc642780b Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 02:10:45 -0500 Subject: [PATCH 25/35] Update install script --- scripts/install.sh | 4 ++-- scripts/install_cross.sh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 5f25d2fba..60f7df724 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -134,8 +134,8 @@ if [ -z $dest ]; then fi say_err "Installing to: $dest" - -url="$url/download/$tag/$target.tar.gz" +#https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz +url="$url/releases/download/$tag/$crate-$target.tar.gz" td=$(mktemp -d || mktemp -d -t tmp) curl -sL $url | tar -C $td -xz diff --git a/scripts/install_cross.sh b/scripts/install_cross.sh index 43332c24d..36062e6f8 100755 --- a/scripts/install_cross.sh +++ b/scripts/install_cross.sh @@ -9,8 +9,6 @@ main() { | grep -E '^v[0.1.0-9.]+$' \ | sort --version-sort \ | tail -n1) - ls -l . - ls ./scripts/* sh ./scripts/install.sh -- \ --force \ --git cross-rs/cross \ From ec44c5f13ee43823b9bd3cd1b9942963abb6861f Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 02:20:46 -0500 Subject: [PATCH 26/35] Echo back the url --- scripts/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install.sh b/scripts/install.sh index 60f7df724..0d51fe829 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -137,6 +137,8 @@ say_err "Installing to: $dest" #https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz url="$url/releases/download/$tag/$crate-$target.tar.gz" +echo $url + td=$(mktemp -d || mktemp -d -t tmp) curl -sL $url | tar -C $td -xz From b20f5768df9f2ffa2bd0dcbb4ac4fd60e4e935f9 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 02:26:24 -0500 Subject: [PATCH 27/35] automatically adds releases/ --- scripts/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 0d51fe829..a22421113 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -135,7 +135,8 @@ fi say_err "Installing to: $dest" #https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz -url="$url/releases/download/$tag/$crate-$target.tar.gz" +#https://github.com/cross-rs/cross/releases/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz +url="$url/download/$tag/$crate-$target.tar.gz" echo $url From 01376cb225958af2e7456f15567a430630b14ba5 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 02:46:24 -0500 Subject: [PATCH 28/35] Trying to understand error --- scripts/install_mdbook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install_mdbook.sh b/scripts/install_mdbook.sh index 9314944b5..ad8dddf31 100755 --- a/scripts/install_mdbook.sh +++ b/scripts/install_mdbook.sh @@ -2,6 +2,10 @@ set -ex +#Getting issue error: unrecognized subcommand '/home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/rustc' +ls /home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/* +/home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/rustc --version + if [[ $1 == *"apple"* ]]; then exit 0 else From 36711add894fc31a6864ccc475a0f66b35748729 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 03:32:53 -0500 Subject: [PATCH 29/35] Log sccache --- .travis.yml | 1 + scripts/install.sh | 1 - scripts/install_mdbook.sh | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b37d0dbd5..a46d05f1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,7 @@ env: - RUSTC_WRAPPER=sccache # A clean build seems to create ~300M - SCCACHE_CACHE_SIZE=500M + - RUST_LOG=debug sccache ... script: - > if [ ! -z $TRAVIS_TAG ]; then diff --git a/scripts/install.sh b/scripts/install.sh index a22421113..2380e1d0f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -135,7 +135,6 @@ fi say_err "Installing to: $dest" #https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz -#https://github.com/cross-rs/cross/releases/releases/download/v0.2.5/cross-x86_64-unknown-linux-musl.tar.gz url="$url/download/$tag/$crate-$target.tar.gz" echo $url diff --git a/scripts/install_mdbook.sh b/scripts/install_mdbook.sh index ad8dddf31..59b0322af 100755 --- a/scripts/install_mdbook.sh +++ b/scripts/install_mdbook.sh @@ -6,6 +6,8 @@ set -ex ls /home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/* /home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/rustc --version + + if [[ $1 == *"apple"* ]]; then exit 0 else From 7759549b25fa7af8607cdf23782d4aeff76dcf57 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 03:50:22 -0500 Subject: [PATCH 30/35] change sccache version --- .travis.yml | 1 - scripts/install_sccache.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a46d05f1a..b37d0dbd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,6 @@ env: - RUSTC_WRAPPER=sccache # A clean build seems to create ~300M - SCCACHE_CACHE_SIZE=500M - - RUST_LOG=debug sccache ... script: - > if [ ! -z $TRAVIS_TAG ]; then diff --git a/scripts/install_sccache.sh b/scripts/install_sccache.sh index 95a1d33b7..6a774182f 100755 --- a/scripts/install_sccache.sh +++ b/scripts/install_sccache.sh @@ -29,7 +29,7 @@ trap cleanup EXIT # https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-dist-v0.5.4-x86_64-unknown-linux-musl.tar.gz # https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-v0.5.4-aarch64-apple-darwin.tar.gz -VERSION="v0.5.4" +VERSION="v0.5.0" if [[ $1 == *"apple"* ]]; then TARGET=$1 From 541adc6f0017d75fc7fca4f0cc2b70d806a864f3 Mon Sep 17 00:00:00 2001 From: rowanfr Date: Sat, 9 Sep 2023 03:52:24 -0500 Subject: [PATCH 31/35] Changed version of sccache --- scripts/install_sccache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_sccache.sh b/scripts/install_sccache.sh index 6a774182f..a40b0d7dc 100755 --- a/scripts/install_sccache.sh +++ b/scripts/install_sccache.sh @@ -29,7 +29,7 @@ trap cleanup EXIT # https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-dist-v0.5.4-x86_64-unknown-linux-musl.tar.gz # https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-v0.5.4-aarch64-apple-darwin.tar.gz -VERSION="v0.5.0" +VERSION="v0.4.2" if [[ $1 == *"apple"* ]]; then TARGET=$1 From 32937a360891a3725dab98462ae17a3597b7e8ef Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Sat, 9 Sep 2023 13:42:03 +0200 Subject: [PATCH 32/35] chore: Remove .travis.yml --- .travis.yml | 128 ---------------------------------------------------- 1 file changed, 128 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b37d0dbd5..000000000 --- a/.travis.yml +++ /dev/null @@ -1,128 +0,0 @@ -language: rust -sudo: required -services: docker -cache: - directories: - - $HOME/.cargo - - $HOME/.cache/sccache - -# bors setup -branches: - only: - - staging - - trying - # Build PRs - - master - # Build release tags - - /^v?\d+\.\d+(\.\d+)?(-\S*)?$/ - -matrix: - include: - #- rust: nightly-2023-09-05 - # - rust: beta - # - rust: stable Removed # This should be uncommented when 1.74 is made the rustc stable version - # env: ARCH=i686 - - - rust: nightly-2023-09-05 # Change back to rust: stable when 1.74 is made the rustc stable version - env: - - DEPLOY=1 - - PUBLISH=1 - - TARGET=x86_64-unknown-linux-gnu - - #- rust: nightly-2023-09-05 - # env: WASM=1 - - # Only for deployment - # - if: tag IS present - # env: - # - TARGET=x86_64-unknown-freebsd - # - DEPLOY=1 - # - DISABLE_TESTS=1 - - if: tag IS present - env: - - TARGET=x86_64-pc-windows-gnu - - DEPLOY=1 - - if: tag IS present - env: - - TARGET=x86_64-apple-darwin - - DEPLOY=1 - os: osx -os: -- linux - -before_install: - - set -e - - rustup self update -install: - - export PATH="$HOME/bin:$PATH" - - mkdir -p $HOME/bin - - ./scripts/install_sccache.sh $TARGET - - sh scripts/install_cross.sh - - source ~/.cargo/env || true - - ./scripts/install_mdbook.sh $TARGET - -env: - global: - - CRATE_NAME=gluon - - CARGO_INCREMENTAL=0 # Incremental compilation is slower and bloats the travis cache - - RUST_BACKTRACE=1 - - RUSTC_WRAPPER=sccache - # A clean build seems to create ~300M - - SCCACHE_CACHE_SIZE=500M -script: -- > - if [ ! -z $TRAVIS_TAG ]; then - echo "Disabling tests for tagged builds as they timeout otherwise" - elif [ ! -z $DISABLE_TESTS ]; then - return - elif [[ -z ${WASM+set} ]]; then - mdbook build book - ./scripts/travis.sh - if ! git diff-index HEAD --; then - echo "Detected changes in the source after running tests" - exit 1 - fi - else - rustup target add wasm32-unknown-unknown - cargo check --target wasm32-unknown-unknown -p gluon_c-api - fi -- sccache -s - -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/78796507a78a48a4b18e - on_success: change - on_failure: always - on_start: never - -before_deploy: -# Only run deployment on git tags -- CURRENT_TAG=`git describe --exact-match --abbrev=0 --tags || true` -- > - if [[ $CURRENT_TAG != "" ]]; then - export GIT_HASH=$(git rev-parse HEAD) - sh scripts/before_deploy.sh - fi - -before_cache: - - rm -rf /home/travis/.cargo/registry -deploy: - - provider: releases - api_key: - secure: ImhF+DkxyHyzDQ4SZZlATjgkrzr+yY1xwADxgO2B5Xi+C7AOllkPInSB/RL+C6tebQnxIEop7KU0N4svbIw6zuoDmOvkliP++U1gXDqvpggBT7AXM5ICcLKWUzTdh3XexhL5SUmtH+QvWRwFwcOoq6mic8rc6DSvTojB/NydyJCeHGvx5iSl5o/ZSqrnEjOF/yDMXADVNwQRZebzyXss+wtTfEbD7OZoJ9ihPugDES8EkmScwS/UCJfCfEqBf/AwDSaAxVpPB/2PF7J0bDIB1ORrwA4HUguJ/U5QuV4vea0hNhhIzzwfcsbPhPLARcLENZLirUk3iygbwSPCTNg+8yEz0MPJQVTj/T48cbKkn9rgZfWi3Bs9nyv22ZouKBFQooiQD6b7WhVGY8bA1Q39cTSLfrR9WrkiRS3x11QrNkwWUqvWHb+2u0KtovTnCt9Lxrx0j8WKMO5Onx6hLfGfH00puCNpV8keWqkzriSi7/ce4mBl8HTvFX22bKZ5uZAxX2mPodAtWoh8hgOGMZhjG2ODS1CEQBxWw5nCXkKQE1afaJOEjhzXmmSNzTnfWIFQGk6V9T9LF8u/PrSVmkQCgka/arlUQlKl+Fa8XUEx8DZEHptj2OdP86A2qiUOcsAmYF2z19kYziHYK3Ll1xDPoOSil6Eej5t+n/e37bmvTMY= - file_glob: true - file: target/$CRATE_NAME-$TRAVIS_TAG-$TARGET.* - skip_cleanup: true - on: - tags: true - repo: gluon-lang/gluon - condition: $DEPLOY = 1 - -after_deploy: -- CURRENT_TAG=`git describe --exact-match --abbrev=0 --tags || true` -- > - if [[ $CURRENT_TAG != "" ]] && [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $PUBLISH == "1" ]]; then - cargo login $CRATES_IO_TOKEN - ./scripts/publish.sh "${CURRENT_TAG}" - fi From 86acf32fa8e0a181e7557271729c7825cc9fd539 Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Sat, 9 Sep 2023 15:11:02 +0200 Subject: [PATCH 33/35] chore: Fix warnings --- base/src/fixed.rs | 2 +- scripts/install_mdbook.sh | 7 +------ vm/src/lazy.rs | 4 ++-- vm/src/thread.rs | 24 ++++++++++++------------ 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/base/src/fixed.rs b/base/src/fixed.rs index 5382346a5..21c61f4a3 100644 --- a/base/src/fixed.rs +++ b/base/src/fixed.rs @@ -400,7 +400,7 @@ impl Buffer { // SAFETY This effectively works as a RefCell since the mutable reference is limited to // this module unsafe { - let mut values = self.values.unsafe_get_mut(); + let values = self.values.unsafe_get_mut(); let cap = match values.current().map(|vec| (vec.len(), vec.capacity())) { Some((len, capacity)) => { if len == capacity { diff --git a/scripts/install_mdbook.sh b/scripts/install_mdbook.sh index 59b0322af..f1288b461 100755 --- a/scripts/install_mdbook.sh +++ b/scripts/install_mdbook.sh @@ -2,11 +2,6 @@ set -ex -#Getting issue error: unrecognized subcommand '/home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/rustc' -ls /home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/* -/home/travis/.rustup/toolchains/nightly-2023-09-05-x86_64-unknown-linux-gnu/bin/rustc --version - - if [[ $1 == *"apple"* ]]; then exit 0 @@ -17,4 +12,4 @@ fi MDBOOK_VERSION="mdbook-v0.2.1-${TARGET}" curl -L "https://github.com/rust-lang-nursery/mdBook/releases/download/v0.2.1/$MDBOOK_VERSION.tar.gz" | tar -xvz chmod +x ./mdbook -mv ./mdbook $HOME/bin/ +mv ./mdbook $HOME/bin/ diff --git a/vm/src/lazy.rs b/vm/src/lazy.rs index 55425dc71..3065bad7d 100644 --- a/vm/src/lazy.rs +++ b/vm/src/lazy.rs @@ -166,7 +166,7 @@ fn force( let lazy_lock = lazy.value.lock().unwrap(); match *lazy_lock { Lazy_::Value(ref value) => { - vm.current_context().push(value.clone()); + vm.current_context().push(value); Pushed::default() } _ => unreachable!(), @@ -176,7 +176,7 @@ fn force( )) } Lazy_::Value(ref value) => { - vm.current_context().push(value.clone()); + vm.current_context().push(value); Either::Left(future::ready(RuntimeResult::Return(Pushed::default()))) } _ => unreachable!(), diff --git a/vm/src/thread.rs b/vm/src/thread.rs index 505e26c03..a8b96e74f 100644 --- a/vm/src/thread.rs +++ b/vm/src/thread.rs @@ -574,18 +574,18 @@ impl<'de, 'gc> serde::de::DeserializeState<'de, crate::serialization::DeSeed<'gc impl Drop for Thread { fn drop(&mut self) { - // The child threads need to refer to `self` so drop the gc (and thus the child threads) - // first so that `self` is valid while dropping them - let context = self.context.get_mut().unwrap_or_else(|err| { - // Ignore poisoning since we don't need to interact with the Gc values, only - // drop them - err.into_inner() - }); - let mut gc_to_drop = - ::std::mem::replace(&mut context.gc, Gc::new(Generation::default(), 0)); - // Make sure that the RefMut is dropped before the Gc itself as the RwLock is dropped + // Make sure that context reference is dropped before the Gc itself as the RwLock is dropped // when the Gc is dropped - drop(context); + let mut gc_to_drop = { + // The child threads need to refer to `self` so drop the gc (and thus the child threads) + // first so that `self` is valid while dropping them + let context = self.context.get_mut().unwrap_or_else(|err| { + // Ignore poisoning since we don't need to interact with the Gc values, only + // drop them + err.into_inner() + }); + ::std::mem::replace(&mut context.gc, Gc::new(Generation::default(), 0)) + }; // SAFETY GcPtr's may not leak outside of the `Thread` so we can safely clear it when // droppting the thread @@ -2574,7 +2574,7 @@ where where T: StackState, { - let stack = self.stack.enter_scope_excess(args, state.clone(), excess)?; + let stack = self.stack.enter_scope_excess(args, state, excess)?; self.hook.previous_instruction_index = usize::max_value(); Ok(ExecuteContext { thread: self.thread, From e6d5ca5e5a459453b1702cb0f55396188a056632 Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Sat, 9 Sep 2023 15:37:42 +0200 Subject: [PATCH 34/35] chore: Remove mentions of travis CI bors etc These services are no longer used. Github actions work better for everything now. --- .github/workflows/rust.yml | 2 +- CONTRIBUTING.md | 2 +- Cargo.toml | 3 --- README.md | 10 +++++----- base/Cargo.toml | 3 --- bors.toml | 5 ----- c-api/Cargo.toml | 3 --- check/Cargo.toml | 3 --- parser/Cargo.toml | 3 --- repl/Cargo.toml | 3 --- scripts/cargo_install.sh | 20 -------------------- scripts/{travis.sh => ci.sh} | 2 -- vm/Cargo.toml | 3 --- 13 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 bors.toml delete mode 100755 scripts/cargo_install.sh rename scripts/{travis.sh => ci.sh} (94%) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0c8ed834a..1d35905ae 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -45,7 +45,7 @@ jobs: return elif [[ -z ${WASM+set} ]]; then mdbook build book - ./scripts/travis.sh + ./scripts/ci.sh if ! git diff-index HEAD --; then echo "Detected changes in the source after running tests" exit 1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e7e282cb..9388073df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,7 @@ Gluon can build with version 1.9.0 of Rust or later but we recommend version 1.1 To build and run all(*) tests for Gluon you can call `cargo test --features test --all`. Instead of `--all` you can pass the `-p ` and `--test ` flags to compile a specific crate and/or test module. For instance, `cargo test --features test -p gluon_parser --test basic` to run the tests in [parsers/tests/basic.rs](https://github.com/gluon-lang/gluon/blob/master/parser/tests/basic.rs). -(*) You can see what Travis CI actually builds and tests in [scripts/travis.sh](https://github.com/gluon-lang/gluon/blob/master/scripts/travis.sh). Most of the time you should not need to worry about these additional tests and can just rely on travis running them. +(*) You can see what Github actions actually builds and tests in [scripts/ci.sh](https://github.com/gluon-lang/gluon/blob/master/scripts/ci.sh). Most of the time you should not need to worry about these additional tests and can just rely on CI running them. ## Pull requests diff --git a/Cargo.toml b/Cargo.toml index db408233e..94c7e8bc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,9 +15,6 @@ homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [workspace] members = ["c-api", "repl", "completion", "format", "doc", "codegen"] diff --git a/README.md b/README.md index 022afe081..b2f56d63b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # gluon -[![Build Status](https://travis-ci.org/gluon-lang/gluon.svg?branch=master)](https://travis-ci.org/gluon-lang/gluon) [![Gitter](https://badges.gitter.im/gluon-lang/gluon.svg)](https://gitter.im/gluon-lang/gluon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![crates.io](https://meritbadge.herokuapp.com/gluon)](https://crates.io/crates/gluon) [![Documentation](https://docs.rs/gluon/badge.svg)](https://docs.rs/crate/gluon) [![Book](https://img.shields.io/badge/gluon-book-yellow.svg)](https://gluon-lang.org/doc/crates_io/book/index.html) [![std](https://img.shields.io/badge/gluon-std-green.svg)](http://gluon-lang.org/doc/nightly/std/index.html) +[![Build Status](https://github.com/gluon-lang/gluon/actions/workflows/rust.yml/badge.svg)](https://github.com/gluon-lang/gluon/actions) [![crates.io](https://meritbadge.herokuapp.com/gluon)](https://crates.io/crates/gluon) [![Documentation](https://docs.rs/gluon/badge.svg)](https://docs.rs/crate/gluon) [![Book](https://img.shields.io/badge/gluon-book-yellow.svg)](https://gluon-lang.org/doc/crates_io/book/index.html) [![std](https://img.shields.io/badge/gluon-std-green.svg)](http://gluon-lang.org/doc/nightly/std/index.html) Gluon is a small, statically-typed, functional programming language designed for application embedding. - +I ## Features -* **Statically-typed** - Static typing makes it easier to write safe and efficient interfaces between gluon and the host application. +* **Seatically-typed** - Static typing makes it easier to write safe and efficient interfaces between gluon and the host application. * **Type inference** - Type inference ensures that types rarely have to be written explicitly giving all the benefits of static types with none of the typing. @@ -261,7 +261,7 @@ Gluon has a [language server](https://github.com/gluon-lang/gluon_language-serve ### Visual Studio Code Extension -The [gluon extension][] for Visual Studio Code provides syntax highlighting and completion. To install it, search for `gluon` among the extensions. ([Github](https://github.com/gluon-lang/gluon_language-server)) +The [gluon extension][] for Visual Studio Code provides syntax highlighting and completion. To install it, search for `gluon` among the extensions. ([Github](https://github.com/gluon-lang/gluon_language-server)) ![example](http://i.imgur.com/44bH0ww.gif) @@ -271,7 +271,7 @@ The [gluon extension][] for Visual Studio Code provides syntax highlighting and [vim-gluon](https://github.com/gluon-lang/vim-gluon) provides syntax highlighting and indentation. -The gluon language server has been tested to work with https://github.com/autozimu/LanguageClient-neovim and https://github.com/prabirshrestha/vim-lsp. +The gluon language server has been tested to work with https://github.com/autozimu/LanguageClient-neovim and https://github.com/prabirshrestha/vim-lsp. #### Example configuration (autozimu/LanguageClient-neovim) ```vim diff --git a/base/Cargo.toml b/base/Cargo.toml index 8a6f68aaf..03963df18 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -12,9 +12,6 @@ homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [dependencies] bitflags = "1.3.2" hashbrown = "0.11.2" diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 8be54ad27..000000000 --- a/bors.toml +++ /dev/null @@ -1,5 +0,0 @@ -status = [ - "continuous-integration/travis-ci/push" -] - -timeout_sec = 7200 diff --git a/c-api/Cargo.toml b/c-api/Cargo.toml index 973139837..fd2e821c0 100644 --- a/c-api/Cargo.toml +++ b/c-api/Cargo.toml @@ -12,9 +12,6 @@ homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [lib] crate-type = ["cdylib"] diff --git a/check/Cargo.toml b/check/Cargo.toml index f4abdd0b6..9f3e212de 100644 --- a/check/Cargo.toml +++ b/check/Cargo.toml @@ -12,9 +12,6 @@ homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [dependencies] collect-mac = "0.1.0" ena = "0.14.2" diff --git a/parser/Cargo.toml b/parser/Cargo.toml index 0748c6502..0e71c2aef 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -14,9 +14,6 @@ documentation = "https://docs.rs/gluon" build = "build.rs" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [dependencies] collect-mac = "0.1.0" itertools = "0.10.5" diff --git a/repl/Cargo.toml b/repl/Cargo.toml index aff47db2c..54929babb 100644 --- a/repl/Cargo.toml +++ b/repl/Cargo.toml @@ -11,9 +11,6 @@ homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [[bin]] name = "gluon" path = "src/main.rs" diff --git a/scripts/cargo_install.sh b/scripts/cargo_install.sh deleted file mode 100755 index c29408720..000000000 --- a/scripts/cargo_install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# This script runs on travis to prep the CI as needed. - -if [ -z "$1" ] || [ -z "$2" ] -then - echo "Expected a package name and its version" - exit 1 -fi - - -PACKAGE=$1 -VERSION=$2 - -if command -v $PACKAGE >/dev/null 2>&1; then - echo "$PACKAGE already installed at $(command -v $PACKAGE)" -else - echo "installing $PACKAGE" - cargo install $PACKAGE --vers $VERSION -fi diff --git a/scripts/travis.sh b/scripts/ci.sh similarity index 94% rename from scripts/travis.sh rename to scripts/ci.sh index 33c464d57..a9bf11cd0 100755 --- a/scripts/travis.sh +++ b/scripts/ci.sh @@ -3,8 +3,6 @@ set -ex export RUST_BACKTRACE=1 -# Split the tests into two on travis so to avoid timing out - declare -a PROJECTS=( gluon_codegen gluon_base diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 0bafa15e5..e278599bb 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -13,9 +13,6 @@ homepage = "https://gluon-lang.org" repository = "https://github.com/gluon-lang/gluon" documentation = "https://docs.rs/gluon" -[badges] -travis-ci = { repository = "gluon-lang/gluon" } - [dependencies] async-trait = "0.1.73" bitflags = "1.3.2" From 37b7ab940fbe283fbf76301eed822356bf4d2453 Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Sat, 9 Sep 2023 15:52:56 +0200 Subject: [PATCH 35/35] chore: Disable scccache on CI Seems to cause CI errors due to https://github.com/mozilla/sccache/issues/1674 --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1d35905ae..bac7db3c4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,7 @@ jobs: CRATE_NAME: gluon CARGO_INCREMENTAL: 0 # Incremental compilation is slower and bloats the cache RUST_BACKTRACE: 1 - RUSTC_WRAPPER: sccache + # RUSTC_WRAPPER: sccache SCCACHE_CACHE_SIZE: 500M steps: - name: Checkout repository @@ -30,13 +30,13 @@ jobs: uses: hecrj/setup-rust-action@v1 with: rust-version: ${{ matrix.rust }} - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - run: echo "$HOME/bin" >> $GITHUB_PATH - run: mkdir -p $HOME/bin - name: Setup tools if: steps.cache.outputs.cache-hit != 'true' run: | - ./scripts/install_sccache.sh $TARGET + # ./scripts/install_sccache.sh $TARGET source ~/.cargo/env || true ./scripts/install_mdbook.sh $TARGET - name: Run tests