diff --git a/Cargo.lock b/Cargo.lock index 39275cc..c9d581e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,9 +38,12 @@ dependencies = [ [[package]] name = "annotate-snippets" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba2d96b8c8b5e656ad7ffb0d09f57772f10a1db74c8d23fca0ec695b38a4047" +checksum = "5c96c3d1062ea7101741480185a6a1275eab01cbe8b20e378d1311bc056d2e08" +dependencies = [ + "unicode-width", +] [[package]] name = "anyhow" @@ -92,7 +95,7 @@ dependencies = [ "once_cell", "parking 2.0.0", "polling", - "socket2", + "socket2 0.3.17", "vec-arena", "wepoll-sys-stjepang", "winapi 0.3.9", @@ -125,7 +128,7 @@ dependencies = [ "futures-util", "log", "pin-project 1.0.2", - "tokio", + "tokio 0.2.23", "tokio-rustls", "tungstenite 0.11.1", "webpki-roots", @@ -272,6 +275,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + [[package]] name = "cache-padded" version = "1.1.1" @@ -416,7 +425,7 @@ dependencies = [ "rayon", "regex", "serde", - "serde_cbor 0.11.1", + "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -534,12 +543,13 @@ dependencies = [ [[package]] name = "dhall" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e2aa2abb16c2ef064fbc45f5163be5c5ff990e8584e54fb1c8f6e318107289" +checksum = "5a7d7b648a24d2edd4ba9f31fe42c831080522d1cf35bca3522887ba0d802745" dependencies = [ "abnf_to_pest", "annotate-snippets", + "elsa", "hex", "itertools", "lazy_static", @@ -549,21 +559,19 @@ dependencies = [ "pest_consume", "pest_generator", "quote", - "reqwest", + "reqwest 0.11.2", "serde", - "serde_cbor 0.9.0", + "serde_cbor", "sha2", "url", - "walkdir", ] [[package]] name = "dhall_proc_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6cff1e2ddd03851652e0cde982b01dc877c9fc9da9ba25ad4241a151945f09" +checksum = "f64ba6f41d9b223e2e1d7c97a1145a1aa03e57d65e1c9c2baa29f194caf322c9" dependencies = [ - "itertools", "proc-macro2", "quote", "syn", @@ -625,10 +633,10 @@ version = "0.1.0" dependencies = [ "anyhow", "httptest", - "reqwest", + "reqwest 0.10.9", "serde", "serde_json", - "tokio", + "tokio 0.2.23", ] [[package]] @@ -661,6 +669,15 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "elsa" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848344296205756adc00ab3bec02658da0f72eaa1461474aa2d51d64311876a5" +dependencies = [ + "stable_deref_trait", +] + [[package]] name = "encoding_rs" version = "0.8.26" @@ -810,10 +827,10 @@ dependencies = [ "futures-util", "http", "log", - "reqwest", + "reqwest 0.10.9", "serde", "serde_json", - "tokio", + "tokio 0.2.23", "tokio-tungstenite", "tungstenite 0.10.1", "url", @@ -965,7 +982,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -973,12 +990,31 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.23", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] +[[package]] +name = "h2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" +dependencies = [ + "bytes 1.0.1", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.4.0", + "tokio-util 0.6.5", + "tracing", +] + [[package]] name = "half" version = "1.6.0" @@ -1012,7 +1048,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -1023,10 +1059,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] +[[package]] +name = "http-body" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737" +dependencies = [ + "bytes 1.0.1", + "http", + "pin-project-lite 0.2.0", +] + [[package]] name = "httparse" version = "1.3.4" @@ -1046,19 +1093,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1bd96bf54054746b39c93f5e43822e5fa29fb081190d1f24d8f51d2fb800577" dependencies = [ "bstr", - "bytes", + "bytes 0.5.6", "crossbeam-channel 0.4.4", "form_urlencoded", "futures", "http", - "hyper", + "hyper 0.13.9", "log", "once_cell", "regex", "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.23", ] [[package]] @@ -1073,19 +1120,43 @@ version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ - "bytes", + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.2.7", + "http", + "http-body 0.3.1", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.2", + "socket2 0.3.17", + "tokio 0.2.23", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" +dependencies = [ + "bytes 1.0.1", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.2", "http", - "http-body", + "http-body 0.4.1", "httparse", "httpdate", "itoa", "pin-project 1.0.2", - "socket2", - "tokio", + "socket2 0.4.0", + "tokio 1.4.0", "tower-service", "tracing", "want", @@ -1097,12 +1168,12 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-util", - "hyper", + "hyper 0.13.9", "log", "rustls", - "tokio", + "tokio 0.2.23", "tokio-rustls", "webpki", ] @@ -1113,13 +1184,26 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ - "bytes", - "hyper", + "bytes 0.5.6", + "hyper 0.13.9", "native-tls", - "tokio", + "tokio 0.2.23", "tokio-tls", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.0.1", + "hyper 0.14.5", + "native-tls", + "tokio 1.4.0", + "tokio-native-tls", +] + [[package]] name = "idna" version = "0.2.0" @@ -1147,7 +1231,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -1235,9 +1319,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.80" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" +checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" [[package]] name = "libsqlite3-sys" @@ -1351,12 +1435,25 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow", + "miow 0.2.1", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +dependencies = [ + "libc", + "log", + "miow 0.3.7", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-uds" version = "0.6.8" @@ -1365,7 +1462,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -1380,6 +1477,15 @@ dependencies = [ "ws2_32-sys", ] +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "mlua" version = "0.4.2" @@ -1420,9 +1526,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" dependencies = [ "lazy_static", "libc", @@ -1458,6 +1564,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -1899,15 +2014,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" dependencies = [ "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.9", "hyper-rustls", - "hyper-tls", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -1921,7 +2036,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.23", "tokio-rustls", "tokio-tls", "url", @@ -1933,6 +2048,40 @@ dependencies = [ "winreg", ] +[[package]] +name = "reqwest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.1", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body 0.4.1", + "hyper 0.14.5", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.0", + "serde", + "serde_urlencoded", + "tokio 1.4.0", + "tokio-native-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + [[package]] name = "ring" version = "0.16.18" @@ -2023,8 +2172,8 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce7eac2075a4562fbcbad544cd55d72ebc760e0a5594a7c8829cf2b4b42a7a" dependencies = [ - "tokio", - "tokio-util", + "tokio 0.2.23", + "tokio-util 0.3.1", ] [[package]] @@ -2074,17 +2223,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_cbor" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45cd6d95391b16cd57e88b68be41d504183b7faae22030c0cc3b3f73dd57b2fd" -dependencies = [ - "byteorder", - "half", - "serde", -] - [[package]] name = "serde_cbor" version = "0.11.1" @@ -2108,9 +2246,9 @@ dependencies = [ [[package]] name = "serde_dhall" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313ac1225c35cd2760b4124d39fa4df19b4a5e29edd55a3eb3fc0b01940f8707" +checksum = "1393976875f3080d8cd1ff54083129e2e6a30d7a62582b67c3eb5924789e8e75" dependencies = [ "dhall", "dhall_proc_macros", @@ -2152,16 +2290,16 @@ dependencies = [ "async-tungstenite", "base64 0.13.0", "bitflags", - "bytes", + "bytes 0.5.6", "chrono", "command_attr", "flate2", "futures", - "reqwest", + "reqwest 0.10.9", "serde", "serde_json", "static_assertions", - "tokio", + "tokio 0.2.23", "tracing", "tracing-futures", "typemap_rev", @@ -2240,7 +2378,7 @@ dependencies = [ "easy-parallel", "futures-lite", "num_cpus", - "tokio", + "tokio 0.2.23", ] [[package]] @@ -2255,12 +2393,28 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -2396,14 +2550,14 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.22", "mio-uds", "num_cpus", "pin-project-lite 0.1.11", @@ -2411,6 +2565,21 @@ dependencies = [ "tokio-macros", ] +[[package]] +name = "tokio" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +dependencies = [ + "autocfg", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.11", + "num_cpus", + "pin-project-lite 0.2.0", +] + [[package]] name = "tokio-macros" version = "0.2.6" @@ -2422,6 +2591,16 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio 1.4.0", +] + [[package]] name = "tokio-rustls" version = "0.14.1" @@ -2430,7 +2609,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.23", "webpki", ] @@ -2441,7 +2620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.23", ] [[package]] @@ -2454,7 +2633,7 @@ dependencies = [ "log", "native-tls", "pin-project 0.4.27", - "tokio", + "tokio 0.2.23", "tokio-tls", "tungstenite 0.10.1", ] @@ -2465,12 +2644,26 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", "pin-project-lite 0.1.11", - "tokio", + "tokio 0.2.23", +] + +[[package]] +name = "tokio-util" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.0", + "tokio 1.4.0", ] [[package]] @@ -2536,7 +2729,7 @@ checksum = "cfea31758bf674f990918962e8e5f07071a3161bd7c4138ed23e416e1ac4264e" dependencies = [ "base64 0.11.0", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -2556,7 +2749,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -2921,13 +3114,13 @@ dependencies = [ "log", "pfacts", "rand", - "reqwest", + "reqwest 0.10.9", "sdnotify", "serde", "serenity", "six_e", "systemd", - "tokio", + "tokio 0.2.23", ] [[package]] diff --git a/six_e/Cargo.toml b/six_e/Cargo.toml index c31fa5b..4c304f0 100644 --- a/six_e/Cargo.toml +++ b/six_e/Cargo.toml @@ -12,7 +12,7 @@ dnd_dice_roller = "0.3" log = "0" serde = { version = "1", features = ["derive"] } serde_json = "1" -serde_dhall = "0.8" +serde_dhall = "0.10" [dev-dependencies] criterion = "0.3"