diff --git a/Cargo.lock b/Cargo.lock index b8a783ab..b5539c7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "addr2line" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" +checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" dependencies = [ "gimli", ] @@ -34,10 +34,19 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.41" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "arrayref" @@ -76,9 +85,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282" +checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" dependencies = [ "addr2line", "cc", @@ -198,18 +207,18 @@ dependencies = [ [[package]] name = "cast" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cdfa5d50aad6cb4d44dcab6101a7f79925bd59d82ca42f38a9856a28865374" +checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" dependencies = [ - "rustc_version 0.3.3", + "rustc_version 0.4.0", ] [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" [[package]] name = "cfg-if" @@ -229,7 +238,7 @@ version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ - "ansi_term", + "ansi_term 0.11.0", "atty", "bitflags", "strsim", @@ -321,16 +330,16 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" dependencies = [ "atty", "cast", "clap", "criterion-plot", "csv", - "itertools 0.10.1", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -347,22 +356,12 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" -dependencies = [ - "cast", - "itertools 0.9.0", -] - -[[package]] -name = "crossbeam-channel" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cast", + "itertools", ] [[package]] @@ -500,10 +499,10 @@ dependencies = [ ] [[package]] -name = "difference" -version = "2.0.0" +name = "diff" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "digest" @@ -564,9 +563,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -591,7 +590,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", "synstructure", @@ -754,9 +753,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "globset" @@ -856,12 +855,9 @@ checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -984,15 +980,6 @@ dependencies = [ "libc", ] -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.1" @@ -1047,9 +1034,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.97" +version = "0.2.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" [[package]] name = "linked-hash-map" @@ -1141,7 +1128,7 @@ dependencies = [ name = "memofs" version = "0.1.3" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "fs-err", "notify", "serde", @@ -1295,9 +1282,9 @@ dependencies = [ [[package]] name = "object" -version = "0.25.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7" +checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" dependencies = [ "memchr", ] @@ -1322,10 +1309,11 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "opener" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" +checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" dependencies = [ + "bstr", "winapi 0.3.9", ] @@ -1399,22 +1387,9 @@ dependencies = [ [[package]] name = "paste" -version = "0.1.18" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "percent-encoding" @@ -1455,7 +1430,7 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", ] @@ -1513,13 +1488,13 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "pretty_assertions" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" +checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b" dependencies = [ - "ansi_term", + "ansi_term 0.12.1", "ctor", - "difference", + "diff", "output_vt100", ] @@ -1530,7 +1505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", "version_check", @@ -1542,7 +1517,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "version_check", ] @@ -1570,9 +1545,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid 0.2.2", ] @@ -1587,12 +1562,6 @@ dependencies = [ "url 2.2.2", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "0.6.13" @@ -1608,7 +1577,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", ] [[package]] @@ -1816,7 +1785,7 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ - "crossbeam-channel 0.5.1", + "crossbeam-channel", "crossbeam-deque 0.8.0", "crossbeam-utils 0.8.5", "lazy_static", @@ -1825,9 +1794,9 @@ dependencies = [ [[package]] name = "rbx_binary" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032bfc7b1c68c00c003be8529b68e21ef24ecc6be49a6e765f01275648d8a772" +checksum = "2ef5d412170f7cd73437fbc51bd0c2d976a19226b1ca4e0dd4654b9de456ce69" dependencies = [ "log", "lz4", @@ -1839,9 +1808,9 @@ dependencies = [ [[package]] name = "rbx_dom_weak" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fd3820420f2b69c1c359528fc21ce9db9ac198ffa130f2da0f7ad1d6797670" +checksum = "d65a8c420268f17400dd7b1edb259086fe5922b794c1d78027ca605afe38c1e5" dependencies = [ "rbx_types", "serde", @@ -1871,9 +1840,9 @@ dependencies = [ [[package]] name = "rbx_types" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356392c22d20830a73601676dd81922236c2413a209ea9bcb974e22f8c280586" +checksum = "4c42ae2a0d18070ac3139c6a3b7228fe3342559b9520f4da2faa13e2eefb2d59" dependencies = [ "base64 0.11.0", "bitflags", @@ -1885,9 +1854,9 @@ dependencies = [ [[package]] name = "rbx_xml" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b52c5cdcd446dfb29cb534c58679868ddfa2c5f97d33ef8e32e72799895f63" +checksum = "88c71b41834dbf565b040399b011b1d6b006df78692fa3469d5defa985be9cbc" dependencies = [ "base64 0.11.0", "log", @@ -1994,7 +1963,7 @@ dependencies = [ "tokio-timer", "url 1.7.2", "uuid 0.7.4", - "winreg", + "winreg 0.6.2", ] [[package]] @@ -2057,12 +2026,13 @@ dependencies = [ [[package]] name = "roblox_install" -version = "0.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80edbbbcd67bce7ddaf754d94276b30ae0a72eedfdf034c0c987f4a535e4a54" +checksum = "743bb8c693a387f1ae8d2026d82d8b0c175cc4777b97c1f7b12fdb3be595bb13" dependencies = [ "dirs", - "winreg", + "thiserror", + "winreg 0.6.2", ] [[package]] @@ -2073,7 +2043,7 @@ dependencies = [ "backtrace", "bincode", "criterion", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "csv", "env_logger", "fs-err", @@ -2112,7 +2082,7 @@ dependencies = [ "tokio", "uuid 0.8.2", "walkdir", - "winreg", + "winreg 0.9.0", ] [[package]] @@ -2140,11 +2110,11 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 0.11.0", + "semver 1.0.3", ] [[package]] @@ -2207,17 +2177,14 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", + "semver-parser", ] [[package]] name = "semver" -version = "0.11.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", -] +checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" [[package]] name = "semver-parser" @@ -2225,15 +2192,6 @@ 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.126" @@ -2259,7 +2217,7 @@ version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", ] @@ -2358,9 +2316,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" dependencies = [ "clap", "lazy_static", @@ -2369,13 +2327,13 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", ] @@ -2388,22 +2346,22 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "syn" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "unicode-xid 0.2.2", ] [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", "unicode-xid 0.2.2", @@ -2453,20 +2411,20 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", ] @@ -2493,9 +2451,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ "tinyvec_macros", ] @@ -2890,7 +2848,7 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", "wasm-bindgen-shared", @@ -2912,7 +2870,7 @@ version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "syn", "wasm-bindgen-backend", @@ -2987,6 +2945,15 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "winreg" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cdb3898397cf7f624c294948669beafaeebc5577d5ec53d0afb76633593597" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 46c64ea1..61af26a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,25 +63,25 @@ rbx_xml = "0.12.1" anyhow = "1.0.27" backtrace = "0.3" bincode = "1.2.1" -crossbeam-channel = "0.4.0" +crossbeam-channel = "0.5.1" csv = "1.1.1" -env_logger = "0.7.1" +env_logger = "0.9.0" fs-err = "2.2.0" futures = "0.1.29" globset = "0.4.4" -humantime = "1.3.0" +humantime = "2.1.0" hyper = "0.12.35" jod-thread = "0.1.0" lazy_static = "1.4.0" log = "0.4.8" maplit = "1.0.1" notify = "4.0.14" -opener = "0.4.1" +opener = "0.5.0" regex = "1.3.1" reqwest = "0.9.20" ritz = "0.1.0" rlua = "0.17.0" -roblox_install = "0.2.2" +roblox_install = "1.0.0" serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" structopt = "0.3.5" @@ -91,7 +91,7 @@ tokio = "0.1.22" uuid = { version = "0.8.1", features = ["v4", "serde"] } [target.'cfg(windows)'.dependencies] -winreg = "0.6.2" +winreg = "0.9.0" [build-dependencies] memofs = { version = "0.1.3", path = "memofs" } @@ -107,8 +107,8 @@ rojo-insta-ext = { path = "rojo-insta-ext" } criterion = "0.3" insta = { version = "1.3.0", features = ["redactions"] } lazy_static = "1.2" -paste = "0.1" -pretty_assertions = "0.6.1" +paste = "1.0.5" +pretty_assertions = "0.7.2" serde_yaml = "0.8.9" tempfile = "3.0" walkdir = "2.1" diff --git a/memofs/Cargo.toml b/memofs/Cargo.toml index 12c67caa..9dac4351 100644 --- a/memofs/Cargo.toml +++ b/memofs/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://github.com/rojo-rbx/rojo/tree/master/memofs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -crossbeam-channel = "0.4.0" +crossbeam-channel = "0.5.1" fs-err = "2.3.0" notify = "4.0.15" serde = { version = "1.0", features = ["derive"] } diff --git a/plugin/rbx_dom_lua/EncodedValue.lua b/plugin/rbx_dom_lua/EncodedValue.lua index 56741a0a..37cfad6c 100644 --- a/plugin/rbx_dom_lua/EncodedValue.lua +++ b/plugin/rbx_dom_lua/EncodedValue.lua @@ -71,8 +71,8 @@ types = { CFrame = { fromPod = function(pod) - local pos = pod.Position - local orient = pod.Orientation + local pos = pod.position + local orient = pod.orientation return CFrame.new( pos[1], pos[2], pos[3], @@ -89,8 +89,8 @@ types = { r20, r21, r22 = roblox:GetComponents() return { - Position = {x, y, z}, - Orientation = { + position = {x, y, z}, + orientation = { {r00, r01, r02}, {r10, r11, r12}, {r20, r21, r22}, @@ -123,10 +123,10 @@ types = { fromPod = function(pod) local keypoints = {} - for index, keypoint in ipairs(pod.Keypoints) do + for index, keypoint in ipairs(pod.keypoints) do keypoints[index] = ColorSequenceKeypoint.new( - keypoint.Time, - types.Color3.fromPod(keypoint.Color) + keypoint.time, + types.Color3.fromPod(keypoint.color) ) end @@ -138,13 +138,13 @@ types = { for index, keypoint in ipairs(roblox.Keypoints) do keypoints[index] = { - Time = keypoint.Time, - Color = types.Color3.toPod(keypoint.Value), + time = keypoint.Time, + color = types.Color3.toPod(keypoint.Value), } end return { - Keypoints = keypoints, + keypoints = keypoints, } end, }, @@ -223,11 +223,11 @@ types = { fromPod = function(pod) local keypoints = {} - for index, keypoint in ipairs(pod.Keypoints) do + for index, keypoint in ipairs(pod.keypoints) do keypoints[index] = NumberSequenceKeypoint.new( - keypoint.Time, - keypoint.Value, - keypoint.Envelope + keypoint.time, + keypoint.value, + keypoint.envelope ) end @@ -239,14 +239,14 @@ types = { for index, keypoint in ipairs(roblox.Keypoints) do keypoints[index] = { - Time = keypoint.Time, - Value = keypoint.Value, - Envelope = keypoint.Envelope, + time = keypoint.Time, + value = keypoint.Value, + envelope = keypoint.Envelope, } end return { - Keypoints = keypoints, + keypoints = keypoints, } end, }, @@ -257,11 +257,11 @@ types = { return nil else return PhysicalProperties.new( - pod.Density, - pod.Friction, - pod.Elasticity, - pod.FrictionWeight, - pod.ElasticityWeight + pod.density, + pod.friction, + pod.elasticity, + pod.frictionWeight, + pod.elasticityWeight ) end end, @@ -271,11 +271,11 @@ types = { return "Default" else return { - Density = roblox.Density, - Friction = roblox.Friction, - Elasticity = roblox.Elasticity, - FrictionWeight = roblox.FrictionWeight, - ElasticityWeight = roblox.ElasticityWeight, + density = roblox.Density, + friction = roblox.Friction, + elasticity = roblox.Elasticity, + frictionWeight = roblox.FrictionWeight, + elasticityWeight = roblox.ElasticityWeight, } end end, @@ -284,15 +284,15 @@ types = { Ray = { fromPod = function(pod) return Ray.new( - types.Vector3.fromPod(pod.Origin), - types.Vector3.fromPod(pod.Direction) + types.Vector3.fromPod(pod.origin), + types.Vector3.fromPod(pod.direction) ) end, toPod = function(roblox) return { - Origin = types.Vector3.toPod(roblox.Origin), - Direction = types.Vector3.toPod(roblox.Direction), + origin = types.Vector3.toPod(roblox.Origin), + direction = types.Vector3.toPod(roblox.Direction), } end, }, diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__unresolved_values.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__unresolved_values.snap index ecec4172..073b3074 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__unresolved_values.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__unresolved_values.snap @@ -1,6 +1,7 @@ --- source: tests/tests/build.rs expression: contents + --- @@ -31,11 +32,7 @@ expression: contents Color - - 0.5 - 0.25 - 0 - + 8404992