From 57fca165df50ff61ba87fb81d34dc4087f7ebc60 Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Mon, 7 Oct 2019 09:42:35 +0200 Subject: [PATCH] feat: Compile modules in parallel Utilizes some changes to salsa to perform all module compilation in parallel as long as a parallel future executor is supplied. --- Cargo.lock | 3261 +++++++++++++++++++++----------------- Cargo.toml | 34 +- base/src/error.rs | 2 +- c-api/Cargo.toml | 1 + c-api/src/lib.rs | 8 +- check/src/typecheck.rs | 3 - codegen/src/trace.rs | 9 +- doc/Cargo.toml | 1 + examples/http/main.rs | 37 +- format/Cargo.toml | 4 +- repl/Cargo.toml | 5 +- repl/src/main.rs | 41 +- repl/src/repl.rs | 314 ++-- src/compiler_pipeline.rs | 639 ++++---- src/import.rs | 233 ++- src/lib.rs | 312 ++-- src/lift_io.rs | 132 +- src/query.rs | 280 ++-- src/std_lib/http.rs | 226 +-- src/std_lib/io.rs | 117 +- tests/api.rs | 36 +- tests/debug.rs | 92 +- tests/error.rs | 6 +- tests/fail.rs | 1 + tests/inline.rs | 6 +- tests/io.rs | 16 +- tests/main.rs | 264 +-- tests/pass/thread.glu | 22 +- tests/serialization.rs | 29 +- tests/support/mod.rs | 6 +- tests/vm.rs | 38 +- vm/Cargo.toml | 4 +- vm/src/api/function.rs | 119 +- vm/src/api/mod.rs | 65 +- vm/src/channel.rs | 92 +- vm/src/gc.rs | 28 +- vm/src/lazy.rs | 42 +- vm/src/lib.rs | 19 +- vm/src/macros.rs | 110 +- vm/src/serialization.rs | 27 + vm/src/stack.rs | 40 +- vm/src/thread.rs | 395 +++-- vm/src/vm.rs | 42 +- 43 files changed, 4150 insertions(+), 3008 deletions(-) create mode 100644 tests/fail.rs diff --git a/Cargo.lock b/Cargo.lock index ec17136590..672dc5c44f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,3630 +4,4053 @@ name = "adler32" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" [[package]] name = "ahash" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f00e10d4814aa20900e7948174384f79f1317f24f0ba7494e735111653fc330" dependencies = [ - "const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "const-random", ] [[package]] name = "aho-corasick" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" dependencies = [ - "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11", ] [[package]] name = "aho-corasick" version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1", ] [[package]] name = "aho-corasick" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1", ] [[package]] name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "ansi_term" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "anymap" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" [[package]] name = "app_dirs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" dependencies = [ - "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ole32-sys", + "shell32-sys", + "winapi 0.2.8", + "xdg", ] [[package]] name = "arc-swap" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" [[package]] name = "archery" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d308d8fa3f687f7a7588fccc4812ed6914be09518232f00454693a7417273ad2" dependencies = [ - "static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", ] [[package]] name = "arrayref" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" [[package]] name = "arrayvec" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" dependencies = [ - "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "nodrop", ] [[package]] name = "ascii-canvas" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" dependencies = [ - "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "term", +] + +[[package]] +name = "async-trait" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64ebe56ac5fbe89417328eeb4291984d138056dcf694f1414ab0f26d49a6290" +dependencies = [ + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "winapi 0.3.8", ] [[package]] name = "autocfg" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "backtrace" version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" dependencies = [ - "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys", + "cfg-if", + "libc", + "rustc-demangle", ] [[package]] name = "backtrace-sys" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" dependencies = [ - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cc", + "libc", ] [[package]] name = "base64" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", ] [[package]] name = "bincode" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "byteorder", + "serde", ] [[package]] name = "bit-set" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" dependencies = [ - "bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bit-vec", ] [[package]] name = "bit-vec" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" [[package]] name = "bitflags" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2b_simd" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" dependencies = [ - "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayref", + "arrayvec", + "constant_time_eq", ] [[package]] name = "block-buffer" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", + "block-padding", + "byte-tools", + "byteorder", + "generic-array", ] [[package]] name = "block-padding" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" dependencies = [ - "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byte-tools", ] [[package]] name = "bstr" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "memchr 2.2.1", + "regex-automata", + "serde", ] [[package]] name = "byte-tools" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecount" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c" [[package]] name = "byteorder" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" [[package]] name = "bytes" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", + "either", + "iovec", ] [[package]] name = "c2-chacha" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86", ] [[package]] name = "cargo-deadlinks" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9133fa23692b568ed68ceabf9bb5c51290a2267e716d5b664b04afb1d5cda3" dependencies = [ - "cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo_metadata 0.6.4", + "docopt 0.8.3", + "env_logger 0.3.5", + "html5ever", + "log 0.3.9", + "num_cpus", + "rayon", + "reqwest", + "serde", + "serde_derive", + "serde_json", + "url 1.7.2", + "walkdir", ] [[package]] name = "cargo_metadata" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe" dependencies = [ - "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.12.1", + "semver", + "serde", + "serde_derive", + "serde_json", ] [[package]] name = "cargo_metadata" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "semver", + "serde", + "serde_derive", + "serde_json", ] [[package]] name = "cast" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" [[package]] name = "cc" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "clap" version = "2.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0", + "atty", + "bitflags 1.2.1", + "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 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1", ] [[package]] name = "codespan" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03ed0fdf823b4a01c3b6a3e086b4d0a2def8d3cb75b110ec5c988fe2790860a9" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "failure", + "itertools", + "serde", + "serde_derive", ] [[package]] name = "codespan-reporting" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae73f6c4b3803dc2a0fe08ed1ce40e8f3f94ecc8394a82e0696bbc86d4e4fc3" dependencies = [ - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "codespan", + "termcolor 1.0.5", ] [[package]] name = "collect-mac" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f168712e49987bd2f51cb855c4585999e12b1a0abdff60fea4b81b41f2010264" [[package]] name = "compiletest_rs" version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f75b10a18fb53549fdd090846eb01c7f8593914494d1faabc4d3005c436e417a" dependencies = [ - "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfix 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "diff", + "filetime", + "getopts", + "libc", + "log 0.4.8", + "miow 0.3.3", + "regex 1.3.1", + "rustfix", + "serde", + "serde_derive", + "serde_json", + "winapi 0.3.8", ] [[package]] name = "const-random" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe" dependencies = [ - "const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "const-random-macro", + "proc-macro-hack", ] [[package]] name = "const-random-macro" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59" dependencies = [ - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack", + "rand 0.7.2", ] [[package]] name = "constant_time_eq" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" [[package]] name = "cookie" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" dependencies = [ - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time", + "url 1.7.2", ] [[package]] name = "cookie_store" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" dependencies = [ - "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie", + "failure", + "idna 0.1.5", + "log 0.4.8", + "publicsuffix", + "serde", + "serde_json", + "time", + "try_from", + "url 1.7.2", ] [[package]] name = "core-foundation" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" dependencies = [ - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation-sys" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" [[package]] name = "crc32fast" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "criterion" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938703e165481c8d612ea3479ac8342e5615185db37765162e762ec3523e2fc6" dependencies = [ - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "cast", + "clap", + "criterion-plot", + "csv", + "itertools", + "lazy_static", + "num-traits", + "rand_core 0.5.1", + "rand_os 0.2.2", + "rand_xoshiro", + "rayon", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", ] [[package]] name = "criterion-plot" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2" dependencies = [ - "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cast", + "itertools", ] [[package]] name = "crossbeam" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", ] [[package]] name = "crossbeam-channel" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils", ] [[package]] name = "crossbeam-deque" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" dependencies = [ - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayvec", + "cfg-if", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", ] [[package]] name = "crossbeam-queue" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils", ] [[package]] name = "crossbeam-utils" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "lazy_static", ] [[package]] name = "csv" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d" dependencies = [ - "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr", + "csv-core", + "itoa", + "ryu", + "serde", ] [[package]] name = "csv-core" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c" dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1", ] [[package]] name = "ctor" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc" dependencies = [ - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "derive-new" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "diff" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a" [[package]] name = "difference" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "digest" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array", ] [[package]] name = "dirs" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "redox_users", + "winapi 0.3.8", ] [[package]] name = "dirs" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "dirs-sys", ] [[package]] name = "dirs-sys" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "redox_users", + "winapi 0.3.8", ] [[package]] name = "docopt" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "regex 0.2.11", + "serde", + "serde_derive", + "strsim 0.6.0", ] [[package]] name = "docopt" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "regex 1.3.1", + "serde", + "strsim 0.9.2", ] [[package]] name = "downcast-rs" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6" [[package]] name = "dtoa" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" [[package]] name = "either" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" [[package]] name = "ena" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36" dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8", ] [[package]] name = "encoding_rs" version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "env_logger" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" dependencies = [ - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9", + "regex 0.1.80", ] [[package]] name = "env_logger" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "humantime", + "log 0.4.8", + "regex 1.3.1", + "termcolor 1.0.5", ] [[package]] name = "error-chain" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace", ] [[package]] name = "error-chain" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace", + "version_check", ] [[package]] name = "failure" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace", + "failure_derive", ] [[package]] name = "failure_derive" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", + "synstructure", ] [[package]] name = "fake-simd" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "filetime" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "redox_syscall", + "winapi 0.3.8", ] [[package]] name = "fixedbitset" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" [[package]] name = "flate2" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad3c5233c9a940c8719031b423d7e6c16af66e031cb0420b0896f5245bf181d3" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "crc32fast", + "libc", + "miniz_oxide", ] [[package]] name = "fnv" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types-shared", ] [[package]] name = "foreign-types-shared" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "frunk_core" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc452b01a26c8dbad65b205d4f00e85a7ed55103cb75489b74962efae104c9fa" [[package]] name = "fuchsia-cprng" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "fuchsia-zircon" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1", + "fuchsia-zircon-sys", ] [[package]] name = "fuchsia-zircon-sys" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futf" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" dependencies = [ - "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "mac", + "new_debug_unreachable", ] [[package]] name = "futures" version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" + +[[package]] +name = "futures" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-channel-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" +dependencies = [ + "futures-core-preview", + "futures-sink-preview", +] + +[[package]] +name = "futures-core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" + +[[package]] +name = "futures-core-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-cpupool" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +dependencies = [ + "futures 0.1.29", + "num_cpus", +] + +[[package]] +name = "futures-executor" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-executor-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75236e88bd9fe88e5e8bfcd175b665d0528fe03ca4c5207fabc028c8f9d93e98" +dependencies = [ + "futures-core-preview", + "futures-util-preview", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" + +[[package]] +name = "futures-io-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4914ae450db1921a56c91bde97a27846287d062087d4a652efc09bb3a01ebda" + +[[package]] +name = "futures-macro" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764" +dependencies = [ + "proc-macro-hack", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", +] + +[[package]] +name = "futures-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1dce2a0267ada5c6ff75a8ba864b4e679a9e2aa44262af7a3b5516d530d76e" +dependencies = [ + "futures-channel-preview", + "futures-core-preview", + "futures-executor-preview", + "futures-io-preview", + "futures-sink-preview", + "futures-util-preview", +] + +[[package]] +name = "futures-sink" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16" + +[[package]] +name = "futures-sink-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f148ef6b69f75bb610d4f9a2336d4fc88c4b5b67129d1a340dd0fd362efeec" + +[[package]] +name = "futures-task" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9" + +[[package]] +name = "futures-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" +dependencies = [ + "futures 0.1.29", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr 2.2.1", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "futures-util-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview", + "futures-core-preview", + "futures-io-preview", + "futures-sink-preview", + "memchr 2.2.1", + "pin-utils", + "slab", ] [[package]] name = "generic-array" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" dependencies = [ - "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum", ] [[package]] name = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "getrandom" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "wasi", ] [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "gluon" version = "0.13.1" dependencies = [ - "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "compiletest_rs 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", - "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon_base 0.13.1", - "gluon_check 0.13.1", - "gluon_codegen 0.13.1", - "gluon_completion 0.13.1", - "gluon_format 0.13.1", - "gluon_parser 0.13.1", - "gluon_vm 0.13.1", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "little-skeptic 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "salsa 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive_state 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_state 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tensile 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-retry 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "async-trait", + "bincode", + "codespan", + "codespan-reporting", + "collect-mac", + "compiletest_rs", + "criterion", + "either", + "env_logger 0.7.1", + "failure", + "failure_derive", + "futures 0.3.1", + "futures-preview", + "gluon_base", + "gluon_check", + "gluon_codegen", + "gluon_completion", + "gluon_format", + "gluon_parser", + "gluon_vm", + "http", + "hyper 0.13.0-alpha.4", + "itertools", + "little-skeptic", + "log 0.4.8", + "native-tls", + "pin-project", + "pretty_assertions", + "pulldown-cmark 0.6.0", + "quick-error", + "rand 0.7.2", + "rand_xorshift 0.2.0", + "regex 1.3.1", + "salsa", + "serde", + "serde_derive", + "serde_derive_state", + "serde_json", + "serde_state", + "structopt 0.3.3", + "tempfile 3.1.0", + "tensile", + "tokio 0.2.0-alpha.6", + "tokio-executor 0.2.0-alpha.6", + "tokio-net", + "tokio-retry", + "tokio-sync 0.2.0-alpha.6", + "tokio-tls", + "tower-service", + "walkdir", ] [[package]] name = "gluon_base" version = "0.13.1" dependencies = [ - "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive_state 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_state 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "anymap", + "bitflags 1.2.1", + "codespan", + "codespan-reporting", + "collect-mac", + "either", + "fnv", + "hashbrown 0.6.3", + "itertools", + "log 0.4.8", + "ordered-float", + "pretty", + "pretty_assertions", + "quick-error", + "serde", + "serde_derive", + "serde_derive_state", + "serde_state", + "smallvec", + "vec_map", ] [[package]] name = "gluon_c-api" version = "0.13.1" dependencies = [ - "gluon 0.13.1", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.3.1", + "gluon", + "libc", ] [[package]] name = "gluon_check" version = "0.13.1" dependencies = [ - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon_base 0.13.1", - "gluon_codegen 0.13.1", - "gluon_format 0.13.1", - "gluon_parser 0.13.1", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rpds 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "codespan", + "codespan-reporting", + "collect-mac", + "difference", + "ena", + "env_logger 0.7.1", + "gluon_base", + "gluon_codegen", + "gluon_format", + "gluon_parser", + "itertools", + "log 0.4.8", + "pretty", + "pretty_assertions", + "quick-error", + "rpds", + "smallvec", + "strsim 0.9.2", ] [[package]] name = "gluon_codegen" version = "0.13.1" dependencies = [ - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon 0.13.1", - "gluon_vm 0.13.1", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1", + "gluon", + "gluon_vm", + "proc-macro2 1.0.6", + "quote 1.0.2", + "serde", + "serde_derive", + "syn 1.0.7", ] [[package]] name = "gluon_completion" version = "0.13.1" dependencies = [ - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon_base 0.13.1", - "gluon_check 0.13.1", - "gluon_parser 0.13.1", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "codespan", + "collect-mac", + "either", + "env_logger 0.7.1", + "gluon_base", + "gluon_check", + "gluon_parser", + "itertools", + "walkdir", ] [[package]] name = "gluon_doc" version = "0.13.1" dependencies = [ - "cargo-deadlinks 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon 0.13.1", - "gluon_completion 0.13.1", - "handlebars 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "opener 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo-deadlinks", + "clap", + "env_logger 0.7.1", + "failure", + "futures 0.3.1", + "gluon", + "gluon_completion", + "handlebars", + "itertools", + "lazy_static", + "log 0.4.8", + "opener", + "pretty", + "pulldown-cmark 0.6.0", + "rayon", + "regex 1.3.1", + "serde", + "serde_derive", + "serde_json", + "structopt 0.3.3", + "walkdir", ] [[package]] name = "gluon_format" version = "0.13.1" dependencies = [ - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon 0.13.1", - "gluon_base 0.13.1", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "codespan", + "difference", + "env_logger 0.7.1", + "futures 0.3.1", + "gluon", + "gluon_base", + "itertools", + "log 0.4.8", + "pretty", + "pretty_assertions", ] [[package]] name = "gluon_parser" version = "0.13.1" dependencies = [ - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon_base 0.13.1", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "codespan", + "codespan-reporting", + "collect-mac", + "difference", + "env_logger 0.7.1", + "gluon_base", + "itertools", + "lalrpop", + "lalrpop-util", + "log 0.4.8", + "ordered-float", + "pretty", + "pretty_assertions", + "quick-error", ] [[package]] name = "gluon_repl" version = "0.13.1" dependencies = [ - "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon 0.13.1", - "gluon_codegen 0.13.1", - "gluon_completion 0.13.1", - "gluon_doc 0.13.1", - "gluon_format 0.13.1", - "gluon_vm 0.13.1", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rexpect 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustyline 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.12.1", + "app_dirs", + "clap", + "codespan", + "codespan-reporting", + "env_logger 0.7.1", + "futures 0.3.1", + "gluon", + "gluon_codegen", + "gluon_completion", + "gluon_doc", + "gluon_format", + "gluon_vm", + "lazy_static", + "log 0.4.8", + "pretty_assertions", + "rexpect", + "rustyline", + "serde", + "serde_derive", + "structopt 0.3.3", + "tokio 0.2.0-alpha.6", + "tokio-signal", + "walkdir", ] [[package]] name = "gluon_vm" version = "0.13.1" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "downcast-rs 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "frunk_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "gluon 0.13.1", - "gluon_base 0.13.1", - "gluon_check 0.13.1", - "gluon_codegen 0.13.1", - "gluon_parser 0.13.1", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive_state 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_state 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "typed-arena 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "async-trait", + "bitflags 1.2.1", + "codespan", + "codespan-reporting", + "collect-mac", + "crossbeam-utils", + "difference", + "downcast-rs", + "env_logger 0.7.1", + "frunk_core", + "futures 0.3.1", + "gluon", + "gluon_base", + "gluon_check", + "gluon_codegen", + "gluon_parser", + "itertools", + "lalrpop", + "lalrpop-util", + "log 0.4.8", + "ordered-float", + "parking_lot", + "petgraph", + "pretty", + "pretty_assertions", + "quick-error", + "regex 1.3.1", + "serde", + "serde_derive", + "serde_derive_state", + "serde_json", + "serde_state", + "slab", + "smallvec", + "typed-arena", ] [[package]] name = "h2" version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" +dependencies = [ + "byteorder", + "bytes", + "fnv", + "futures 0.1.29", + "http", + "indexmap", + "log 0.4.8", + "slab", + "string", + "tokio-io 0.1.12", +] + +[[package]] +name = "h2" +version = "0.2.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f107db1419ef8271686187b1a5d47c6431af4a7f4d98b495e7b7fc249bb0a78" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "fnv", + "futures-core-preview", + "futures-sink-preview", + "futures-util-preview", + "http", + "indexmap", + "log 0.4.8", + "slab", + "string", + "tokio-codec", + "tokio-io 0.2.0-alpha.6", + "tokio-sync 0.2.0-alpha.6", ] [[package]] name = "handlebars" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ef1ac30f2eaaa2b835fce73c57091cb6b9fc62b7eef285efbf980b0f20001b" dependencies = [ - "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.5.0", + "log 0.4.8", + "pest", + "pest_derive", + "quick-error", + "serde", + "serde_json", + "walkdir", ] [[package]] name = "hashbrown" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" dependencies = [ - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", ] [[package]] name = "hashbrown" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" dependencies = [ - "ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "ahash", + "autocfg", ] [[package]] name = "heck" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" dependencies = [ - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "html5ever" version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c213fa6a618dc1da552f54f85cba74b05d8e883c92ec4e89067736938084c26e" dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8", + "mac", + "markup5ever", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", ] [[package]] name = "http" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7e06e336150b178206af098a055e3621e8336027e2b4d126bda0bc64824baaf" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "fnv", + "itoa", ] [[package]] name = "http-body" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures 0.1.29", + "http", + "tokio-buf", +] + +[[package]] +name = "http-body" +version = "0.2.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3aef6f3de2bd8585f5b366f3f550b5774500b4764d00cf00f903c95749eec3" +dependencies = [ + "bytes", + "http", ] [[package]] name = "httparse" version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" [[package]] name = "humantime" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error", ] [[package]] name = "hyper" version = "0.12.35" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" +dependencies = [ + "bytes", + "futures 0.1.29", + "futures-cpupool", + "h2 0.1.26", + "http", + "http-body 0.1.0", + "httparse", + "iovec", + "itoa", + "log 0.4.8", + "net2", + "rustc_version", + "time", + "tokio 0.1.22", + "tokio-buf", + "tokio-executor 0.1.8", + "tokio-io 0.1.12", + "tokio-reactor", + "tokio-tcp", + "tokio-threadpool", + "tokio-timer 0.2.11", + "want 0.2.0", +] + +[[package]] +name = "hyper" +version = "0.13.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d05aa523087ac0b9d8b93dd80d5d482a697308ed3b0dca7b0667511a7fa7cdc" +dependencies = [ + "bytes", + "futures-channel-preview", + "futures-core-preview", + "futures-util-preview", + "h2 0.2.0-alpha.3", + "http", + "http-body 0.2.0-alpha.3", + "httparse", + "iovec", + "itoa", + "log 0.4.8", + "net2", + "pin-project", + "time", + "tokio 0.2.0-alpha.6", + "tokio-executor 0.2.0-alpha.6", + "tokio-io 0.2.0-alpha.6", + "tokio-net", + "tokio-sync 0.2.0-alpha.6", + "tokio-timer 0.3.0-alpha.6", + "tower-make", + "tower-service", + "want 0.3.0", ] [[package]] name = "hyper-tls" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures 0.1.29", + "hyper 0.12.35", + "native-tls", + "tokio-io 0.1.12", ] [[package]] name = "idna" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "idna" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "indexmap" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", ] [[package]] name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "itertools" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fa75c9dea7b07be3138c49abbb83fd4bea199b5cdc76f9804458edc5da0d6e" dependencies = [ - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "either", ] [[package]] name = "itoa" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" [[package]] name = "kernel32-sys" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8", + "winapi-build", ] [[package]] name = "lalrpop" version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64dc3698e75d452867d9bd86f4a723f452ce9d01fe1d55990b79f0c790aa67db" dependencies = [ - "ascii-canvas 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", - "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ascii-canvas", + "atty", + "bit-set", + "diff", + "docopt 1.1.0", + "ena", + "itertools", + "lalrpop-util", + "petgraph", + "regex 1.3.1", + "regex-syntax 0.6.12", + "serde", + "serde_derive", + "sha2", + "string_cache", + "term", + "unicode-xid 0.1.0", ] [[package]] name = "lalrpop-util" version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c277d18683b36349ab5cd030158b54856fca6bb2d5dc5263b06288f486958b7c" [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin", +] [[package]] name = "libc" version = "0.2.65" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" [[package]] name = "little-skeptic" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7dddaf3ddd27cda3cadb710e17a80399d0393fb08e95a82403d746fe13c67c" dependencies = [ - "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "handlebars 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bytecount", + "cargo_metadata 0.8.2", + "error-chain 0.12.1", + "failure", + "glob", + "handlebars", + "pulldown-cmark 0.5.3", + "serde_json", + "tempdir", + "walkdir", ] [[package]] name = "lock_api" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" dependencies = [ - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard", ] [[package]] name = "log" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8", ] [[package]] name = "log" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "mac" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "maplit" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897636f9850c3eef4905a5540683ed53dc9393860f0846cab2c2ddf9939862ff" dependencies = [ - "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "phf", + "phf_codegen", + "serde", + "serde_derive", + "serde_json", + "string_cache", + "string_cache_codegen", + "tendril", ] [[package]] name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "memchr" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "memoffset" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a85c1a8c329f11437034d7313dca647c79096523533a1c79e86f1d0f657c7cc" dependencies = [ - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version", ] [[package]] name = "mime" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf" [[package]] name = "mime_guess" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" dependencies = [ - "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime", + "unicase", ] [[package]] name = "miniz_oxide" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" dependencies = [ - "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "adler32", ] [[package]] name = "mio" version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" dependencies = [ - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log 0.4.8", + "miow 0.2.1", + "net2", + "slab", + "winapi 0.2.8", ] [[package]] name = "mio-uds" version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" dependencies = [ - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec", + "libc", + "mio", ] [[package]] name = "miow" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", ] [[package]] name = "miow" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" dependencies = [ - "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2", + "winapi 0.3.8", ] [[package]] name = "native-tls" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", - "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "libc", + "log 0.4.8", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile 3.1.0", ] [[package]] name = "net2" version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "winapi 0.3.8", ] [[package]] name = "new_debug_unreachable" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30" [[package]] name = "nix" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" dependencies = [ - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.9.1", + "cfg-if", + "libc", + "void", ] [[package]] name = "nix" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1", + "cc", + "cfg-if", + "libc", + "void", ] [[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "num-traits" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", ] [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155394f924cdddf08149da25bfb932d226b4a593ca7468b08191ff6335941af5" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", ] [[package]] name = "ole32-sys" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8", + "winapi-build", ] [[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.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "openssl" version = "0.10.25" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1", + "cfg-if", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", ] [[package]] name = "openssl-probe" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" version = "0.9.52" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] name = "ordered-float" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518" dependencies = [ - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits", ] [[package]] name = "ordermap" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" [[package]] name = "output_vt100" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "parking_lot" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ - "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api", + "parking_lot_core", + "rustc_version", ] [[package]] name = "parking_lot_core" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "cloudabi", + "libc", + "redox_syscall", + "rustc_version", + "smallvec", + "winapi 0.3.8", ] [[package]] name = "percent-encoding" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pest" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a" dependencies = [ - "ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ucd-trie", ] [[package]] name = "pest_derive" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" dependencies = [ - "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pest", + "pest_generator", ] [[package]] name = "pest_generator" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0" dependencies = [ - "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "pest", + "pest_meta", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "pest_meta" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547" dependencies = [ - "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "maplit", + "pest", + "sha-1", ] [[package]] name = "petgraph" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" dependencies = [ - "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fixedbitset", + "ordermap", ] [[package]] name = "phf" version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" dependencies = [ - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared", ] [[package]] name = "phf_codegen" version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" dependencies = [ - "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator", + "phf_shared", ] [[package]] name = "phf_generator" version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" dependencies = [ - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared", + "rand 0.6.5", ] [[package]] name = "phf_shared" version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5fce7042b4e4338a3f868e563fff394709c3ff62cf6908d407dd9e2caff96ed" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7644b4721cc27235f667e735da8732f5b781c442157315674c0cb7f28b4cabf3" dependencies = [ - "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] +[[package]] +name = "pin-utils" +version = "0.1.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" + [[package]] name = "pkg-config" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" [[package]] name = "ppv-lite86" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" [[package]] name = "precomputed-hash" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "pretty" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3" dependencies = [ - "typed-arena 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "typed-arena", ] [[package]] name = "pretty_assertions" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0", + "ctor", + "difference", + "output_vt100", ] [[package]] name = "proc-macro-error" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "proc-macro-hack" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] +[[package]] +name = "proc-macro-nested" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" + [[package]] name = "proc-macro2" version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0", ] [[package]] name = "proc-macro2" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0", ] [[package]] name = "publicsuffix" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" dependencies = [ - "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.12.1", + "idna 0.2.0", + "lazy_static", + "regex 1.3.1", + "url 2.1.0", ] [[package]] name = "pulldown-cmark" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1", + "memchr 2.2.1", + "unicase", ] [[package]] name = "pulldown-cmark" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b0ad0d4c1702965ee6bb5b4ff5e71f83850b497d497e9444302987bf9e26a4" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1", + "getopts", + "memchr 2.2.1", + "unicase", ] [[package]] name = "quick-error" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" [[package]] name = "quote" version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.30", ] [[package]] name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", ] [[package]] name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "rand 0.4.6", ] [[package]] name = "rand" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ - "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi 0.3.8", ] [[package]] name = "rand" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc 0.1.0", + "rand_isaac", + "rand_jitter", + "rand_os 0.1.3", + "rand_pcg 0.1.2", + "rand_xorshift 0.1.1", + "winapi 0.3.8", ] [[package]] name = "rand" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "libc", + "rand_chacha 0.2.1", + "rand_core 0.5.1", + "rand_hc 0.2.0", + "rand_pcg 0.2.1", ] [[package]] name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "rand_core 0.3.1", ] [[package]] name = "rand_chacha" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" dependencies = [ - "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "c2-chacha", + "rand_core 0.5.1", ] [[package]] name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" dependencies = [ - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2", ] [[package]] name = "rand_core" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", ] [[package]] name = "rand_hc" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1", ] [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1", ] [[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 (registry+https://github.com/rust-lang/crates.io-index)", + "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 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "rand_core 0.4.2", + "winapi 0.3.8", ] [[package]] name = "rand_os" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" dependencies = [ - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi 0.3.8", ] [[package]] name = "rand_os" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "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 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "rand_core 0.4.2", ] [[package]] name = "rand_pcg" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1", ] [[package]] name = "rand_xorshift" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1", ] [[package]] name = "rand_xorshift" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" dependencies = [ - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1", ] [[package]] name = "rand_xoshiro" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff" dependencies = [ - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1", ] [[package]] name = "rayon" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque", + "either", + "rayon-core", ] [[package]] name = "rayon-core" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "lazy_static", + "num_cpus", ] [[package]] name = "rdrand" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1", ] [[package]] name = "redox_syscall" version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "redox_users" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "failure", + "rand_os 0.1.3", + "redox_syscall", + "rust-argon2", ] [[package]] name = "regex" version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" dependencies = [ - "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.5.3", + "memchr 0.1.11", + "regex-syntax 0.3.9", + "thread_local 0.2.7", + "utf8-ranges 0.1.3", ] [[package]] name = "regex" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" dependencies = [ - "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.6.10", + "memchr 2.2.1", + "regex-syntax 0.5.6", + "thread_local 0.3.6", + "utf8-ranges 1.0.4", ] [[package]] name = "regex" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.7.6", + "memchr 2.2.1", + "regex-syntax 0.6.12", + "thread_local 0.3.6", ] [[package]] name = "regex-automata" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", ] [[package]] name = "regex-syntax" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" [[package]] name = "regex-syntax" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" dependencies = [ - "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "ucd-util", ] [[package]] name = "regex-syntax" version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" [[package]] name = "remove_dir_all" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "reqwest" version = "0.9.22" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +checksum = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650" +dependencies = [ + "base64", + "bytes", + "cookie", + "cookie_store", + "encoding_rs", + "flate2", + "futures 0.1.29", + "http", + "hyper 0.12.35", + "hyper-tls", + "log 0.4.8", + "mime", + "mime_guess", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "time", + "tokio 0.1.22", + "tokio-executor 0.1.8", + "tokio-io 0.1.12", + "tokio-threadpool", + "tokio-timer 0.2.11", + "url 1.7.2", + "uuid", + "winreg", ] [[package]] name = "rexpect" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9f223820adfca83e60e8b577346a0f7122e313eade41d46794766d953029a9c" dependencies = [ - "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.11.0", + "nix 0.9.0", + "regex 0.2.11", + "tempfile 2.2.0", ] [[package]] name = "rpds" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1196a0a2f52d343bd32179834273eaac7d8739f7e3f8b700227d2fa06b9a423b" dependencies = [ - "archery 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "archery", ] [[package]] name = "rust-argon2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "base64", + "blake2b_simd", + "crossbeam-utils", ] [[package]] name = "rustc-demangle" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" [[package]] name = "rustc-hash" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", ] [[package]] name = "rustc_version" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "semver", ] [[package]] name = "rustfix" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "failure", + "log 0.4.8", + "serde", + "serde_json", ] [[package]] name = "rustyline" -version = "5.0.3" +version = "5.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d8eb9912bc492db051324d36f5cea56984fc2afeaa5c6fa84e0b0e3cde550f" dependencies = [ - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 2.0.2", + "libc", + "log 0.4.8", + "memchr 2.2.1", + "nix 0.14.1", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi 0.3.8", ] [[package]] name = "ryu" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" [[package]] name = "salsa" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.13.0" dependencies = [ - "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "salsa-macros 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "async-trait", + "crossbeam", + "futures-preview", + "indexmap", + "log 0.4.8", + "parking_lot", + "rand 0.7.2", + "rustc-hash", + "salsa-macros", + "smallvec", ] [[package]] name = "salsa-macros" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.13.1" dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "heck", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "same-file" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" dependencies = [ - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util", ] [[package]] name = "schannel" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "winapi 0.3.8", ] [[package]] name = "scopeguard" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" [[package]] name = "security-framework" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04" dependencies = [ - "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" dependencies = [ - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", ] [[package]] name = "semver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "semver-parser", + "serde", ] [[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" dependencies = [ - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "serde_derive_state" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a401fb412de4353f1045d7491ee848b00ccb458638ff9dda94922059f01f3bf" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "serde_json" version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" dependencies = [ - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "ryu", + "serde", ] [[package]] name = "serde_state" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2090da092b18994dae3c333d9df5aec47010b3bff292a974eba76b92e214c4" dependencies = [ - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", ] [[package]] name = "serde_urlencoded" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" dependencies = [ - "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dtoa", + "itoa", + "serde", + "url 1.7.2", ] [[package]] name = "sha-1" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" dependencies = [ - "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", ] [[package]] name = "sha2" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" dependencies = [ - "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", ] [[package]] name = "shell32-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8", + "winapi-build", ] [[package]] name = "signal-hook" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "signal-hook-registry", ] [[package]] name = "signal-hook-registry" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" dependencies = [ - "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap", + "libc", ] [[package]] name = "siphasher" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "0.6.10" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +dependencies = [ + "maybe-uninit", +] [[package]] name = "socket2" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "redox_syscall", + "winapi 0.3.8", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "static_assertions" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3" [[package]] name = "string" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", ] [[package]] name = "string_cache" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "new_debug_unreachable", + "phf_shared", + "precomputed-hash", + "serde", + "string_cache_codegen", + "string_cache_shared", ] [[package]] name = "string_cache_codegen" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" dependencies = [ - "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator", + "phf_shared", + "proc-macro2 1.0.6", + "quote 1.0.2", + "string_cache_shared", ] [[package]] name = "string_cache_shared" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" [[package]] name = "strsim" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" [[package]] name = "structopt" version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "clap", + "structopt-derive 0.2.18", ] [[package]] name = "structopt" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "clap", + "structopt-derive 0.3.3", ] [[package]] name = "structopt-derive" version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "heck", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", ] [[package]] name = "structopt-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae" dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "heck", + "proc-macro-error", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] name = "syn" version = "0.15.44" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", ] [[package]] name = "syn" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "unicode-xid 0.2.0", ] [[package]] name = "synstructure" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575be94ccb86e8da37efb894a87e2b660be299b41d8ef347f9d6d79fbe61b1ba" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6", + "quote 1.0.2", + "syn 1.0.7", + "unicode-xid 0.2.0", ] [[package]] name = "tempdir" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" dependencies = [ - "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.6", + "remove_dir_all", ] [[package]] name = "tempfile" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys", + "libc", + "rand 0.3.23", + "redox_syscall", + "winapi 0.2.8", ] [[package]] name = "tempfile" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "rand 0.7.2", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.8", ] [[package]] name = "tendril" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" dependencies = [ - "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futf", + "mac", + "utf-8", ] [[package]] name = "tensile" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.5.1-alpha.0" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.3.1", + "structopt 0.2.18", + "structopt-derive 0.2.18", + "termcolor 0.3.6", + "tokio-executor 0.2.0-alpha.6", ] [[package]] name = "term" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", + "dirs 1.0.5", + "winapi 0.3.8", ] [[package]] name = "termcolor" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" dependencies = [ - "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 0.1.6", ] [[package]] name = "termcolor" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" dependencies = [ - "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 1.0.2", ] [[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "thread-id" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys", + "libc", ] [[package]] name = "thread_local" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" dependencies = [ - "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thread-id", ] [[package]] name = "thread_local" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", ] [[package]] name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "redox_syscall", + "winapi 0.3.8", ] [[package]] name = "tinytemplate" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20" dependencies = [ - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", + "serde_json", ] [[package]] name = "tokio" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures 0.1.29", + "mio", + "num_cpus", + "tokio-current-thread", + "tokio-executor 0.1.8", + "tokio-io 0.1.12", + "tokio-reactor", + "tokio-tcp", + "tokio-threadpool", + "tokio-timer 0.2.11", +] + +[[package]] +name = "tokio" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f17f5d6ab0f35c1506678b28fb1798bdf74fcb737e9843c7b17b73e426eba38" +dependencies = [ + "bytes", + "futures-core-preview", + "futures-sink-preview", + "futures-util-preview", + "num_cpus", + "tokio-codec", + "tokio-executor 0.2.0-alpha.6", + "tokio-fs", + "tokio-io 0.2.0-alpha.6", + "tokio-macros", + "tokio-net", + "tokio-sync 0.2.0-alpha.6", + "tokio-timer 0.3.0-alpha.6", + "tracing-core", ] [[package]] name = "tokio-buf" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "either", + "futures 0.1.29", ] [[package]] name = "tokio-codec" -version = "0.1.1" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f5d22fd1e84bd4045d28813491cb7d7caae34d45c80517c2213f09a85e8787a" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures-core-preview", + "futures-sink-preview", + "log 0.4.8", + "tokio-io 0.2.0-alpha.6", ] [[package]] name = "tokio-current-thread" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29", + "tokio-executor 0.1.8", ] [[package]] name = "tokio-executor" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils", + "futures 0.1.29", +] + +[[package]] +name = "tokio-executor" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "futures-core-preview", + "futures-util-preview", + "lazy_static", + "num_cpus", + "slab", + "tokio-sync 0.2.0-alpha.6", + "tracing", ] [[package]] name = "tokio-fs" -version = "0.1.6" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf85e16971e06e680c622e0c1b455be94b086275c5ddcd6d4a83a2bfbb83cda" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core-preview", + "futures-util-preview", + "lazy_static", + "tokio-executor 0.2.0-alpha.6", + "tokio-io 0.2.0-alpha.6", + "tokio-sync 0.2.0-alpha.6", ] [[package]] name = "tokio-io" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" +dependencies = [ + "bytes", + "futures 0.1.29", + "log 0.4.8", +] + +[[package]] +name = "tokio-io" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112784d5543df30660b04a72ca423bfbd90e8bb32f94dcf610f15401218b22c5" +dependencies = [ + "bytes", + "futures-core-preview", + "log 0.4.8", + "memchr 2.2.1", + "pin-project", +] + +[[package]] +name = "tokio-macros" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b616374bcdadd95974e1f0dfca07dc913f1163c53840c0d664aca35114964e" +dependencies = [ + "quote 1.0.2", + "syn 1.0.7", +] + +[[package]] +name = "tokio-net" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a441682cd32f3559383112c4a7f372f5c9fa1950c5cf8c8dd05274a2ce8c2654" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "crossbeam-utils", + "futures-core-preview", + "futures-sink-preview", + "futures-util-preview", + "iovec", + "lazy_static", + "libc", + "mio", + "mio-uds", + "num_cpus", + "parking_lot", + "slab", + "tokio-codec", + "tokio-executor 0.2.0-alpha.6", + "tokio-io 0.2.0-alpha.6", + "tokio-sync 0.2.0-alpha.6", + "tracing", ] [[package]] name = "tokio-reactor" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils", + "futures 0.1.29", + "lazy_static", + "log 0.4.8", + "mio", + "num_cpus", + "parking_lot", + "slab", + "tokio-executor 0.1.8", + "tokio-io 0.1.12", + "tokio-sync 0.1.7", ] [[package]] name = "tokio-retry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c03755b956458582182941061def32b8123a26c98b08fc6ddcf49ae89d18f33" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29", + "rand 0.4.6", + "tokio-timer 0.2.11", ] [[package]] name = "tokio-signal" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29", + "libc", + "mio", + "mio-uds", + "signal-hook", + "tokio-executor 0.1.8", + "tokio-io 0.1.12", + "tokio-reactor", + "winapi 0.3.8", ] [[package]] name = "tokio-sync" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" dependencies = [ - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv", + "futures 0.1.29", +] + +[[package]] +name = "tokio-sync" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1aaeb685540f7407ea0e27f1c9757d258c7c6bf4e3eb19da6fc59b747239d2" +dependencies = [ + "fnv", + "futures-core-preview", + "futures-sink-preview", + "futures-util-preview", ] [[package]] name = "tokio-tcp" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures 0.1.29", + "iovec", + "mio", + "tokio-io 0.1.12", + "tokio-reactor", ] [[package]] name = "tokio-threadpool" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "futures 0.1.29", + "lazy_static", + "log 0.4.8", + "num_cpus", + "slab", + "tokio-executor 0.1.8", ] [[package]] name = "tokio-timer" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils", + "futures 0.1.29", + "slab", + "tokio-executor 0.1.8", +] + +[[package]] +name = "tokio-timer" +version = "0.3.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97c1587fe71018eb245a4a9daa13a5a3b681bbc1f7fdadfe24720e141472c13" +dependencies = [ + "crossbeam-utils", + "futures-core-preview", + "futures-util-preview", + "slab", + "tokio-executor 0.2.0-alpha.6", + "tokio-sync 0.2.0-alpha.6", ] [[package]] name = "tokio-tls" -version = "0.2.1" +version = "0.3.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566b4086589c7eebb86aa625d302ab80720ef2aa088649dcae18ec4d754cbd16" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls", + "tokio-io 0.2.0-alpha.6", ] [[package]] -name = "tokio-udp" +name = "tower-make" +version = "0.3.0-alpha.2a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "316d47dd40cde4ac5d88110eaf9a10a4e2a68612d9c056cd2aa24e37dcb484cd" +dependencies = [ + "tokio-io 0.2.0-alpha.6", + "tower-service", +] + +[[package]] +name = "tower-service" +version = "0.3.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63ff37396cd966ce43bea418bfa339f802857495f797dafa00bea5b7221ebdfa" + +[[package]] +name = "tracing" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4e4f59e752cb3beb5b61c6d5e11191c7946231ba84faec2902c9efdd8691c5" +dependencies = [ + "cfg-if", + "log 0.4.8", + "spin", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4263b12c3d3c403274493eb805966093b53214124796552d674ca1dd5d27c2b" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2", + "syn 1.0.7", ] [[package]] -name = "tokio-uds" -version = "0.2.5" +name = "tracing-core" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc913647c520c959b6d21e35ed8fa6984971deca9f0a2fcb8c51207e0c56af1d" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "spin", ] [[package]] name = "try-lock" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try_from" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "typed-arena" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" [[package]] name = "typenum" version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" [[package]] name = "ucd-trie" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" [[package]] name = "ucd-util" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" [[package]] name = "unicase" version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" dependencies = [ - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check", ] [[package]] name = "unicode-bidi" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", ] [[package]] name = "unicode-normalization" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" dependencies = [ - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] name = "unicode-segmentation" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f5526225fd8b77342d5986ab5f6055552e9c0776193b5b63fd53b46debfad7" [[package]] name = "unicode-width" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" [[package]] name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "url" version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" dependencies = [ - "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", ] [[package]] name = "url" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" dependencies = [ - "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "idna 0.2.0", + "matches", + "percent-encoding 2.1.0", ] [[package]] name = "utf-8" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" [[package]] name = "utf8-ranges" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" [[package]] name = "utf8-ranges" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" [[package]] name = "utf8parse" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" [[package]] name = "uuid" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" dependencies = [ - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5", ] [[package]] name = "vcpkg" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" [[package]] name = "vec_map" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" [[package]] name = "version_check" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "void" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "walkdir" version = "2.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" dependencies = [ - "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file", + "winapi 0.3.8", + "winapi-util", ] [[package]] name = "want" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +dependencies = [ + "futures 0.1.29", + "log 0.4.8", + "try-lock", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8", + "try-lock", ] [[package]] name = "wasi" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" [[package]] name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "wincolor" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "wincolor" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", + "winapi-util", ] [[package]] name = "winreg" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "ws2_32-sys" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8", + "winapi-build", ] [[package]] name = "xdg" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -"checksum ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "b35dfc96a657c1842b4eb73180b65e37152d4b94d0eb5cb51708aee7826950b4" -"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" -"checksum app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" -"checksum archery 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d308d8fa3f687f7a7588fccc4812ed6914be09518232f00454693a7417273ad2" -"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -"checksum ascii-canvas 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" -"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -"checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92" -"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" -"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" -"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" -"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" -"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" -"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -"checksum bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c" -"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum cargo-deadlinks 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce9133fa23692b568ed68ceabf9bb5c51290a2267e716d5b664b04afb1d5cda3" -"checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe" -"checksum cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" -"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -"checksum codespan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03ed0fdf823b4a01c3b6a3e086b4d0a2def8d3cb75b110ec5c988fe2790860a9" -"checksum codespan-reporting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2ae73f6c4b3803dc2a0fe08ed1ce40e8f3f94ecc8394a82e0696bbc86d4e4fc3" -"checksum collect-mac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f168712e49987bd2f51cb855c4585999e12b1a0abdff60fea4b81b41f2010264" -"checksum compiletest_rs 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f75b10a18fb53549fdd090846eb01c7f8593914494d1faabc4d3005c436e417a" -"checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe" -"checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59" -"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" -"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" -"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -"checksum criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "938703e165481c8d612ea3479ac8342e5615185db37765162e762ec3523e2fc6" -"checksum criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2" -"checksum crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c" -"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" -"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" -"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d" -"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c" -"checksum ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc" -"checksum derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" -"checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a" -"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a" -"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -"checksum downcast-rs 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5fe414cc2fd4447b7da94b27ddfb6831a8a06f35f6d077ab5613ec703866c49a" -"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" -"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -"checksum ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36" -"checksum encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)" = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9" -"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" -"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" -"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" -"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469" -"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" -"checksum flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ad3c5233c9a940c8719031b423d7e6c16af66e031cb0420b0896f5245bf181d3" -"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -"checksum frunk_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc452b01a26c8dbad65b205d4f00e85a7ed55103cb75489b74962efae104c9fa" -"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" -"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" -"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" -"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -"checksum handlebars 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "91ef1ac30f2eaaa2b835fce73c57091cb6b9fc62b7eef285efbf980b0f20001b" -"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" -"checksum hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6587d09be37fb98a11cb08b9000a3f592451c1b1b613ca69d949160e313a430a" -"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -"checksum html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c213fa6a618dc1da552f54f85cba74b05d8e883c92ec4e89067736938084c26e" -"checksum http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d7e06e336150b178206af098a055e3621e8336027e2b4d126bda0bc64824baaf" -"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" -"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" -"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" -"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" -"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum lalrpop 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64dc3698e75d452867d9bd86f4a723f452ce9d01fe1d55990b79f0c790aa67db" -"checksum lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c277d18683b36349ab5cd030158b54856fca6bb2d5dc5263b06288f486958b7c" -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" -"checksum little-skeptic 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f7dddaf3ddd27cda3cadb710e17a80399d0393fb08e95a82403d746fe13c67c" -"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" -"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -"checksum markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "897636f9850c3eef4905a5540683ed53dc9393860f0846cab2c2ddf9939862ff" -"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" -"checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf" -"checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" -"checksum miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "304f66c19be2afa56530fa7c39796192eef38618da8d19df725ad7c6d6b2aaae" -"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" -"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" -"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -"checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" -"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30" -"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -"checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" -"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" -"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" -"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -"checksum opener 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" -"checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" -"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" -"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518" -"checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" -"checksum output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" -"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -"checksum pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a" -"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -"checksum pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0" -"checksum pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547" -"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" -"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" -"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -"checksum pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3" -"checksum pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" -"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" -"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -"checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" -"checksum pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" -"checksum pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85b0ad0d4c1702965ee6bb5b4ff5e71f83850b497d497e9444302987bf9e26a4" -"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -"checksum rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a" -"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -"checksum rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e196346cbbc5c70c77e7b4926147ee8e383a38ee4d15d58a08098b169e492b6" -"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -"checksum rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -"checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff" -"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" -"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" -"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" -"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9" -"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" -"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650" -"checksum rexpect 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c9f223820adfca83e60e8b577346a0f7122e313eade41d46794766d953029a9c" -"checksum rpds 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1196a0a2f52d343bd32179834273eaac7d8739f7e3f8b700227d2fa06b9a423b" -"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" -"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -"checksum rustfix 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607" -"checksum rustyline 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4795e277e6e57dec9df62b515cd4991371daa80e8dc8d80d596e58722b89c417" -"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -"checksum salsa 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec0865bdd9d8e614686a0cbb76979c735810131d287eb1683e91e4e64a58c387" -"checksum salsa-macros 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cac182212d3a1db75ddc42399ff1461b258a694b8318ee7e0baf6c976e39efee" -"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" -"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" -"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" -"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" -"checksum serde_derive_state 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2a401fb412de4353f1045d7491ee848b00ccb458638ff9dda94922059f01f3bf" -"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" -"checksum serde_state 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa2090da092b18994dae3c333d9df5aec47010b3bff292a974eba76b92e214c4" -"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" -"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" -"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" -"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" -"checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68" -"checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" -"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" -"checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3" -"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -"checksum string_cache 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "96ccb3a75a3caf2d7f2eb9ada86ec1fbbd4c74ad2bd8dc00a96a0c2f93509ef0" -"checksum string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" -"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" -"checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" -"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" -"checksum structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" -"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" -"checksum structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae" -"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" -"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" -"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -"checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" -"checksum tensile 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5563b05d192807e783898298deb808cd4ef158e1801742210cc2841efdaae1" -"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" -"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -"checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20" -"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" -"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" -"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" -"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" -"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" -"checksum tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d" -"checksum tokio-retry 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c03755b956458582182941061def32b8123a26c98b08fc6ddcf49ae89d18f33" -"checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296" -"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" -"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" -"checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" -"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" -"checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" -"checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b" -"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" -"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" -"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -"checksum typed-arena 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c0704a799d314795d3d847d519b284bae681ef9b1f3da99f7ebc7b47ba2e607" -"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -"checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" -"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" -"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" -"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" -"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" -"checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" -"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" -"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" -"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" -"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" -"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" -"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" -"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" +checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/Cargo.toml b/Cargo.toml index af209ff175..581452c003 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,28 +32,36 @@ gluon_codegen = { path = "codegen", version = "0.13.1" } # GLUON gluon_vm = { path = "vm", version = "0.13.1", default-features = false } # GLUON gluon_format = { path = "format", version = "0.13.1", default-features = false } # GLUON +async-trait = "0.1" log = "0.4" quick-error = "1.0.0" collect-mac = "0.1.0" either = "1.0.0" itertools = "0.8" -futures = "0.1.11" +futures = { version = "0.3.1", features = ["thread-pool"] } +futures-preview = { version = "0.3.0-alpha.19", package = "futures-preview" } codespan = "0.3" codespan-reporting = "0.3" -salsa = "0.13.1" +pin-project = "0.4" +salsa = { version = "0.13.0", path = "../salsa" } serde = { version = "1.0.0", optional = true } serde_state = { version = "0.4", optional = true } serde_derive_state = { version = "0.4.7", optional = true } +tokio = "0.2.0-alpha.6" +tokio-executor = "0.2.0-alpha.6" +tokio-sync = "0.2.0-alpha.6" + # Binding crates regex = { version = "1", optional = true } # web +tower-service = { version = "0.3.0-alpha.1", optional = true } http = { version = "0.1", optional = true } -hyper = { version = "0.12", optional = true } +hyper = { version = "0.13.0-alpha.4", optional = true, features = ["unstable-stream"] } native-tls = { version = "0.2", optional = true } -tokio-tls = { version = "0.2", optional = true } -tokio-tcp = { version = "0.1", optional = true } +tokio-tls = { version = "0.3.0-alpha.6", optional = true } +tokio-net = { version = "0.2.0-alpha.6", optional = true, features = ["tcp", "async-traits"] } # Crates used in testing compiletest_rs = { version = "0.3.23", optional = true } @@ -71,17 +79,18 @@ walkdir = "2" [dev-dependencies] criterion = "0.3" -tensile = "0.5" collect-mac = "0.1.0" env_logger = "0.7" -pretty_assertions = "0.6" -futures-cpupool = "0.1.8" -tokio = "0.1.7" -tokio-retry = "0.2" -walkdir = "2" failure = "0.1" failure_derive = "0.1" +pretty_assertions = "0.6" +structopt = "0.3" tempfile = "3.0.4" +tensile = { path = "../tensile", features = ["tokio-executor"] } +tokio = "0.2.0-alpha.6" +tokio-executor = "0.2.0-alpha.6" +tokio-retry = "0.2" +walkdir = "2" serde = "1.0.0" serde_derive = "1.0.0" @@ -98,7 +107,7 @@ gluon_codegen = { path = "codegen", version = "0.13.1" } # GLUON default = ["regex", "random"] random = ["rand", "rand_xorshift"] serialization = ["serde", "serde_state", "serde_derive_state", "gluon_vm/serialization"] -web = ["hyper", "http", "native-tls", "tokio-tcp", "tokio-tls"] +web = ["hyper", "http", "tower-service", "native-tls", "tokio-net", "tokio-tls"] docs_rs = ["serialization"] @@ -121,6 +130,7 @@ harness = false [[test]] name = "main" harness = false +required-features = ["serialization"] [[example]] name = "marshalling" diff --git a/base/src/error.rs b/base/src/error.rs index e77233c81e..0d13c93edf 100644 --- a/base/src/error.rs +++ b/base/src/error.rs @@ -327,7 +327,7 @@ where } } -impl AsDiagnostic for Box { +impl AsDiagnostic for Box { fn as_diagnostic(&self) -> Diagnostic { Diagnostic::new_error(self.to_string()) } diff --git a/c-api/Cargo.toml b/c-api/Cargo.toml index dc2f080831..881b3e73ae 100644 --- a/c-api/Cargo.toml +++ b/c-api/Cargo.toml @@ -20,6 +20,7 @@ crate-type = ["cdylib"] [dependencies] gluon = { version = "0.13.1", path = ".." } # GLUON +futures = "0.3" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] libc = "0.2.14" diff --git a/c-api/src/lib.rs b/c-api/src/lib.rs index 7669983ac0..3def543b76 100644 --- a/c-api/src/lib.rs +++ b/c-api/src/lib.rs @@ -3,6 +3,8 @@ use std::{slice, str}; +use futures::{executor::block_on, future}; + use gluon::{ vm::{ api::{CPrimitive, Getable, Hole, OpaqueValue, Pushable}, @@ -83,8 +85,10 @@ pub unsafe extern "C" fn glu_load_script( #[no_mangle] pub extern "C" fn glu_call_function(thread: &Thread, args: VmIndex) -> Error { - let context = thread.context(); - match thread.call_function(context, args) { + match block_on(future::poll_fn(|cx| { + let context = thread.context(); + thread.call_function(cx, context, args) + })) { Ok(_) => Error::Ok, Err(_) => Error::Unknown, } diff --git a/check/src/typecheck.rs b/check/src/typecheck.rs index 1fea58afb4..fd936cb93d 100644 --- a/check/src/typecheck.rs +++ b/check/src/typecheck.rs @@ -206,9 +206,6 @@ impl<'a> Typecheck<'a> { } fn find(&mut self, id: &Symbol) -> TcResult { - if id.declared_name().contains("test") { - "".to_string(); - } match self.environment.find_mod_type(id).map(|t| t.to_owned()) { Some(typ) => { self.named_variables.clear(); diff --git a/codegen/src/trace.rs b/codegen/src/trace.rs index e8a3f5f15c..e34252130d 100644 --- a/codegen/src/trace.rs +++ b/codegen/src/trace.rs @@ -55,7 +55,10 @@ fn gen_struct_cons<'a, I>(_ident: &Ident, fields: I) -> TokenStream where I: IntoIterator, { - let fields = fields.into_iter().map(|field| &field.ident).collect::>(); + let fields = fields + .into_iter() + .map(|field| &field.ident) + .collect::>(); quote! { match self { Self { #(#fields),* } => { @@ -90,7 +93,9 @@ fn derive_enum( ident: Ident, generics: Generics, ) -> TokenStream { - let cons = if ast.variants.is_empty() {quote!() } else { + let cons = if ast.variants.is_empty() { + quote!() + } else { let variants = ast .variants .iter() diff --git a/doc/Cargo.toml b/doc/Cargo.toml index d4d68f256a..da14a16d6f 100644 --- a/doc/Cargo.toml +++ b/doc/Cargo.toml @@ -15,6 +15,7 @@ documentation = "https://docs.rs/gluon" clap = "2.22.0" env_logger = "0.7" failure = { version = "0.1", features = ["backtrace"] } +futures = "0.3" handlebars = "2" itertools = "0.8" lazy_static = "1" diff --git a/examples/http/main.rs b/examples/http/main.rs index 329c681a70..0724312016 100644 --- a/examples/http/main.rs +++ b/examples/http/main.rs @@ -5,9 +5,7 @@ //! //! [hyper]:https://hyper.rs -use std::{env, fs::File, io::Read}; - -use futures::{future, prelude::*}; +use std::{env, fs}; use gluon::{ new_vm, @@ -15,7 +13,8 @@ use gluon::{ Thread, ThreadExt, }; -fn main() { +#[tokio::main] +async fn main() { env_logger::init(); let port = env::args() @@ -24,27 +23,21 @@ fn main() { .unwrap_or(80); let thread = new_vm(); - tokio::run(start(&thread, port).map_err(|err| panic!("{}", err))); + if let Err(err) = start(&thread, port).await { + panic!("{}", err) + } } -fn start(thread: &Thread, port: u16) -> impl Future { +async fn start(thread: &Thread, port: u16) -> Result<(), failure::Error> { let thread = thread.root_thread(); - future::lazy(|| -> Result<_, failure::Error> { - // Last we run our `http_server.glu` module which returns a function which starts listening - // on the port we passed from the command line - let mut expr = String::new(); - { - let mut file = File::open("examples/http/server.glu")?; - file.read_to_string(&mut expr)?; - } - Ok(expr) - }) - .and_then(move |expr| { - thread - .run_expr_async:: IO<()>>>("examples/http/server.glu", &expr) - .from_err() - .and_then(move |(mut listen, _)| listen.call_async(port).from_err().map(|_| ())) - }) + // Last we run our `http_server.glu` module which returns a function which starts listening + // on the port we passed from the command line + let expr = fs::read_to_string("examples/http/server.glu")?; + let (mut listen, _) = thread + .run_expr_async:: IO<()>>>("examples/http/server.glu", &expr) + .await?; + listen.call_async(port).await?; + Ok(()) } #[cfg(test)] diff --git a/format/Cargo.toml b/format/Cargo.toml index 2cab79eb8a..2dd7843600 100644 --- a/format/Cargo.toml +++ b/format/Cargo.toml @@ -20,9 +20,11 @@ codespan = "0.3" gluon_base = { path = "../base", version = "0.13.1" } # GLUON [dev-dependencies] -env_logger = "0.7" difference = "2" +env_logger = "0.7" +futures = "0.3.1" pretty_assertions = "0.6" + gluon_base = { path = "../base", version = "0.13.1" } # GLUON gluon = { path = "..", version = ">=0.9" } diff --git a/repl/Cargo.toml b/repl/Cargo.toml index 663724690f..54babbb43e 100644 --- a/repl/Cargo.toml +++ b/repl/Cargo.toml @@ -28,9 +28,8 @@ gluon_format = { version = "0.13.1", path = "../format" } # GLUON gluon_doc = { version = "0.13.1", path = "../doc" } # GLUON app_dirs = "1.0.0" -futures = "0.1.11" -futures-cpupool = "0.1" -tokio = "0.1" +futures = { version = "0.3", features = ["compat"] } +tokio = "0.2.0-alpha.6" tokio-signal = "0.2" clap = "2.22.0" structopt = "0.3" diff --git a/repl/src/main.rs b/repl/src/main.rs index 830fbb8772..334e062016 100644 --- a/repl/src/main.rs +++ b/repl/src/main.rs @@ -23,7 +23,6 @@ use codespan_reporting::termcolor; use structopt::StructOpt; use walkdir::WalkDir; -use futures::future; use tokio::runtime::Runtime; use gluon::{base, parser, vm}; @@ -158,18 +157,20 @@ fn init_env_logger() { #[cfg(not(feature = "env_logger"))] fn init_env_logger() {} -fn format(file: &str, file_map: Arc, opt: &Opt) -> Result { +async fn format(file: &str, file_map: Arc, opt: &Opt) -> Result { let thread = new_vm(); thread.get_database_mut().use_standard_lib(!opt.no_std); - Ok(thread.format_expr( - &mut gluon_format::Formatter::default(), - file, - file_map.src(), - )?) + Ok(thread + .format_expr_async( + &mut gluon_format::Formatter::default(), + file, + file_map.src(), + ) + .await?) } -fn fmt_file(name: &Path, opt: &Opt) -> Result<()> { +async fn fmt_file(name: &Path, opt: &Opt) -> Result<()> { use std::fs::File; use std::io::Read; @@ -182,7 +183,7 @@ fn fmt_file(name: &Path, opt: &Opt) -> Result<()> { let module_name = filename_to_module(&name.display().to_string()); let mut code_map = codespan::CodeMap::new(); let file_map = code_map.add_filemap(module_name.clone().into(), buffer); - let formatted = format(&module_name, file_map.clone(), opt)?; + let formatted = format(&module_name, file_map.clone(), opt).await?; // Avoid touching the .glu file if it did not change if file_map.src() != formatted { @@ -198,7 +199,7 @@ fn fmt_file(name: &Path, opt: &Opt) -> Result<()> { Ok(()) } -fn fmt_stdio(opt: &Opt) -> Result<()> { +async fn fmt_stdio(opt: &Opt) -> Result<()> { use std::io::{stdin, stdout, Read}; let mut buffer = String::new(); @@ -207,12 +208,12 @@ fn fmt_stdio(opt: &Opt) -> Result<()> { let mut code_map = codespan::CodeMap::new(); let file_map = code_map.add_filemap("STDIN".into(), buffer); - let formatted = format("STDIN", file_map, opt)?; + let formatted = format("STDIN", file_map, opt).await?; stdout().write_all(formatted.as_bytes())?; Ok(()) } -fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), gluon::Error> { +async fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), gluon::Error> { vm.global_env().set_debug_level(opt.debug_level.clone()); match opt.subcommand_opt { Some(SubOpt::Fmt(ref fmt_opt)) => { @@ -238,10 +239,10 @@ fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), gluon::E gluon_files.dedup(); for file in gluon_files { - fmt_file(&file, opt)?; + fmt_file(&file, opt).await?; } } else { - fmt_stdio(opt)?; + fmt_stdio(opt).await?; } } Some(SubOpt::Doc(ref doc_opt)) => { @@ -252,13 +253,10 @@ fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), gluon::E } None => { if opt.interactive { - let mut runtime = Runtime::new()?; let prompt = opt.prompt.clone(); let debug_level = opt.debug_level.clone(); let use_std_lib = !opt.no_std; - runtime.block_on(future::lazy(move || { - repl::run(color, &prompt, debug_level, use_std_lib) - }))?; + repl::run(color, &prompt, debug_level, use_std_lib).await?; } else if !opt.input.is_empty() { run_files(&vm, &opt.input)?; } else { @@ -280,11 +278,14 @@ fn main() { .use_standard_lib(!opt.no_std) .run_io(true); - if let Err(err) = run(&opt, opt.color, &vm) { + let runtime = Runtime::new().unwrap(); + let color = opt.color; + let result = runtime.block_on(run(&opt, opt.color, &vm)); + if let Err(err) = result { match err { Error::VM(VMError::Message(_)) => eprintln!("{}\n{}", err, vm.context().stacktrace(0)), _ => { - let mut stderr = termcolor::StandardStream::stderr(opt.color.into()); + let mut stderr = termcolor::StandardStream::stderr(color.into()); if let Err(err) = err.emit(&mut stderr, &vm.get_database().code_map()) { eprintln!("{}", err); } else { diff --git a/repl/src/repl.rs b/repl/src/repl.rs index 1f75ed4073..70840e7ed4 100644 --- a/repl/src/repl.rs +++ b/repl/src/repl.rs @@ -3,9 +3,11 @@ extern crate gluon_completion as completion; use std::{borrow::Cow, error::Error as StdError, path::PathBuf, str::FromStr, sync::Mutex}; use futures::{ - future::{self, Either}, - sync::mpsc, - {Future, Sink, Stream}, + channel::oneshot, + compat::*, + future::{self}, + prelude::*, + task::SpawnExt, }; use crate::base::{ @@ -38,23 +40,19 @@ use codespan_reporting::termcolor; use crate::Color; -macro_rules! try_future { - ($e:expr, $f:expr) => { - match $e { - Ok(ok) => ok, - Err(err) => return $f(::futures::future::err(err.into())), - } - }; -} - -fn type_of_expr(args: WithVM<&str>) -> IO> { +fn type_of_expr(args: WithVM<&str>) -> impl Future>> { let WithVM { vm, value: args } = args; - IO::Value(match vm.typecheck_str("", &args, None) { - Ok((expr, _)) => { - let env = vm.get_env(); - Ok(format!("{}", expr.env_type_of(&env))) - } - Err(msg) => Err(format!("{}", msg)), + let args = args.to_string(); + let vm = vm.root_thread(); + + gluon::sendify(async move { + IO::Value(match vm.typecheck_str_async("", &args, None).await { + Ok((expr, _)) => { + let env = vm.get_env(); + Ok(format!("{}", expr.env_type_of(&env))) + } + Err(msg) => Err(format!("{}", msg)), + }) }) } @@ -81,7 +79,7 @@ fn find_info(args: WithVM<&str>) -> IO> { match env.find_type_info(args) { Ok(alias) => { // Found a type alias - let mut fmt = || -> Result<(), ::std::fmt::Error> { + let mut fmt = || -> Result<(), std::fmt::Error> { write!(&mut buffer, "type {}", args)?; for g in alias.params() { write!(&mut buffer, " {}", g.id)?; @@ -128,8 +126,8 @@ fn switch_debug_level(args: WithVM<&str>) -> IO> { fn complete(thread: &Thread, name: &str, fileinput: &str, pos: usize) -> GluonResult> { use gluon::compiler_pipeline::*; - let db = thread.get_database(); - let mut module_compiler = thread.module_compiler(&db); + let mut db = thread.get_database(); + let mut module_compiler = thread.module_compiler(&mut db); // The parser may find parse errors but still produce an expression // For that case still typecheck the expression but return the parse error afterwards @@ -238,8 +236,8 @@ impl rustyline::completion::Completer for Completer { macro_rules! impl_userdata { ($name:ident) => { - impl ::std::fmt::Debug for $name { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + impl std::fmt::Debug for $name { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { write!(f, concat!(stringify!($name), "(..)")) } } @@ -258,7 +256,7 @@ impl_userdata! { Editor } #[derive(Userdata, Trace, VmType)] #[gluon(vm_type = "CpuPool")] #[gluon_trace(skip)] -struct CpuPool(futures_cpupool::CpuPool); +struct CpuPool(futures::executor::ThreadPool); impl_userdata! { CpuPool } @@ -288,13 +286,13 @@ define_vmtype! { ReadlineError } impl<'vm> Pushable<'vm> for ReadlineError { fn push(self, context: &mut ActiveThread<'vm>) -> VMResult<()> { - ::gluon::vm::api::ser::Ser(self).push(context) + gluon::vm::api::ser::Ser(self).push(context) } } fn app_dir_root() -> Result> { Ok(::app_dirs::app_root( - ::app_dirs::AppDataType::UserData, + app_dirs::AppDataType::UserData, &crate::APP_INFO, )?) } @@ -336,31 +334,39 @@ fn readline(editor: &Editor, prompt: &str) -> IO> } fn new_cpu_pool(size: usize) -> IO { - IO::Value(CpuPool(futures_cpupool::CpuPool::new(size))) + IO::from( + futures::executor::ThreadPool::builder() + .pool_size(size) + .create() + .map(CpuPool), + ) } fn eval_line( De(color): De, WithVM { vm, value: line }: WithVM<&str>, -) -> impl Future, Error = vm::Error> { +) -> impl Future> { let vm = vm.root_thread(); - eval_line_(vm.root_thread(), line).then(move |result| { - Ok(match result { - Ok(x) => IO::Value(x), - Err(err) => { - let mut stderr = termcolor::StandardStream::stderr(color.into()); - if let Err(err) = err.emit(&mut stderr, &vm.get_database().code_map()) { - eprintln!("{}", err); + let line = line.to_string(); + gluon::sendify(async move { + eval_line_(vm.root_thread(), &line) + .map(move |result| match result { + Ok(x) => IO::Value(x), + Err(err) => { + let mut stderr = termcolor::StandardStream::stderr(color.into()); + if let Err(err) = err.emit(&mut stderr, &vm.get_database().code_map()) { + eprintln!("{}", err); + } + IO::Value(()) } - IO::Value(()) - } - }) + }) + .await }) } -fn eval_line_(vm: RootedThread, line: &str) -> impl Future { - let db = vm.get_database(); - let mut module_compiler = vm.module_compiler(&db); +async fn eval_line_(vm: RootedThread, line: &str) -> gluon::Result<()> { + let mut db = vm.get_database(); + let mut module_compiler = vm.module_compiler(&mut db); let repl_line = { let result = { let filemap = vm.get_database().add_filemap("line", line); @@ -371,14 +377,15 @@ fn eval_line_(vm: RootedThread, line: &str) -> impl Future x, Err((_, err)) => { let code_map = vm.get_database().code_map(); - return Either::A(future::err(InFile::new(code_map, err).into())); + return Err(InFile::new(code_map, err).into()); } } }; - let future = match repl_line { - None => return Either::A(future::ok(())), + let result = match repl_line { + None => return Ok(()), Some(ReplLine::Expr(expr)) => { - Either::A(expr.run_expr(&mut module_compiler, vm.clone(), "line", line, None)) + expr.run_expr(&mut module_compiler, vm.clone(), "line", line, None) + .await } Some(ReplLine::Let(mut let_binding)) => { let unpack_pattern = let_binding.name.clone(); @@ -402,20 +409,18 @@ fn eval_line_(vm: RootedThread, line: &str) -> impl Future impl Future>>, -) -> impl Future>, Error = VMError> { - let (sender, receiver) = mpsc::channel(1); - - ::tokio::spawn( - ::tokio_signal::ctrl_c() - .map(|x| { - info!("Installed Ctrl-C handler"); - x - }) - .flatten_stream() - .map_err(|err| { - panic!("Error installing signal handler: {}", err); - }) - .forward(sender.sink_map_err(|_| ())) - .map(|_| ()), - ); +) -> impl Future>> { + let (sender, receiver) = oneshot::channel(); + + tokio::spawn(async move { + let mut signal_stream = tokio_signal::ctrl_c() + .compat() + .await + .unwrap_or_else(|err| panic!("Error installing signal handler: {}", err)) + .compat(); + + info!("Installed Ctrl-C handler"); + if let Some(_) = signal_stream.next().await { + let _ = sender.send(()); + } + }); let mut action = OwnedFunction:: IO>>::from_value( &thread, action.get_variant(), ); - let action_future = cpu_pool.0.spawn_fn(move || action.call_async()); - - let ctrl_c_future = receiver - .into_future() - .map(move |(next, _)| { - next.unwrap(); - thread.interrupt(); - IO::Exception("Interrupted".to_string()) + let action_future = cpu_pool + .0 + .spawn_with_handle(async move { + action + .call_async() + .await + .unwrap_or_else(|err| IO::Exception(err.to_string())) }) - .map_err(|_| panic!("Error in Ctrl-C handling")); + .expect("Unable to spawn action on thread pool"); + + let ctrl_c_future = receiver.map(move |next| { + next.unwrap(); + thread.interrupt(); + IO::Exception("Interrupted".to_string()) + }); - ctrl_c_future - .select(action_future) - .map(|(value, _)| value) - .map_err(|(err, _)| err) + future::select(ctrl_c_future, action_future).map(|either| either.factor_first().0) } fn save_history(editor: &Editor) -> IO<()> { @@ -599,7 +605,7 @@ fn load_repl(vm: &Thread) -> vm::Result { record!( type Color => Color, type Settings => Settings<'static>, - type_of_expr => primitive!(1, type_of_expr), + type_of_expr => primitive!(1, async fn type_of_expr), find_info => primitive!(1, find_info), find_kind => primitive!(1, find_kind), parse_color => primitive!(1, "parse_color", |s: &str| s.parse::()), @@ -611,9 +617,10 @@ fn load_repl(vm: &Thread) -> vm::Result { ) } -fn compile_repl(vm: &Thread) -> Result<(), GluonError> { - let rustyline_types_source = ::gluon::vm::api::typ::make_source::(vm)?; - vm.load_script("rustyline_types", &rustyline_types_source)?; +async fn compile_repl(vm: &Thread) -> Result<(), GluonError> { + let rustyline_types_source = gluon::vm::api::typ::make_source::(vm)?; + vm.load_script_async("rustyline_types", &rustyline_types_source) + .await?; add_extern_module(vm, "repl.prim", load_repl); add_extern_module(vm, "rustyline", load_rustyline); @@ -621,35 +628,33 @@ fn compile_repl(vm: &Thread) -> Result<(), GluonError> { const REPL_SOURCE: &'static str = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/repl.glu")); - vm.load_script("repl", REPL_SOURCE)?; + vm.load_script_async("repl", REPL_SOURCE).await?; Ok(()) } #[allow(dead_code)] -pub fn run( +pub async fn run( color: Color, prompt: &str, debug_level: DebugLevel, use_std_lib: bool, -) -> impl Future { - let vm = ::gluon::VmBuilder::new().build(); +) -> gluon::Result<()> { + let vm = gluon::VmBuilder::new().build(); vm.global_env().set_debug_level(debug_level); vm.get_database_mut() .use_standard_lib(use_std_lib) .run_io(true); - try_future!( - compile_repl(&vm).map_err(|err| err.emit_string(&vm.get_database().code_map()).unwrap()), - Either::A - ); + compile_repl(&vm) + .await + .map_err(|err| err.emit_string(&vm.get_database().code_map()).unwrap())?; - let mut repl: OwnedFunction _> = try_future!(vm.get_global("repl"), Either::A); + let mut repl: OwnedFunction _> = vm.get_global("repl")?; debug!("Starting repl"); - Either::B( - repl.call_async(Settings { color, prompt }) - .map(|_: IO<()>| ()) - .map_err(|err| err.into()), - ) + repl.call_async(Settings { color, prompt }) + .await + .map(|_: IO<()>| ()) + .map_err(|err| err.into()) } #[cfg(test)] @@ -660,11 +665,11 @@ mod tests { use gluon::import::Import; use gluon::{self, RootedThread}; - fn new_vm() -> RootedThread { - if ::std::env::var("GLUON_PATH").is_err() { - ::std::env::set_var("GLUON_PATH", ".."); + async fn new_vm() -> RootedThread { + if std::env::var("GLUON_PATH").is_err() { + std::env::set_var("GLUON_PATH", ".."); } - let vm = gluon::new_vm(); + let vm = gluon::new_vm_async().await; let import = vm.get_macros().get("import"); import .as_ref() @@ -674,24 +679,28 @@ mod tests { vm } - #[test] - fn compile_repl_test() { - let _ = ::env_logger::try_init(); - let vm = new_vm(); - compile_repl(&vm).unwrap_or_else(|err| panic!("{}", err)); + #[tokio::test] + async fn compile_repl_test() { + let _ = env_logger::try_init(); + let vm = new_vm().await; + compile_repl(&vm) + .await + .unwrap_or_else(|err| panic!("{}", err)); let repl: Result) -> IO<()>>, _> = vm.get_global("repl"); assert!(repl.is_ok(), "{}", repl.err().unwrap()); } - #[test] - fn record_patterns() { - let _ = ::env_logger::try_init(); - let vm = new_vm(); - compile_repl(&vm).unwrap_or_else(|err| panic!("{}", err)); + #[tokio::test] + async fn record_patterns() { + let _ = env_logger::try_init(); + let vm = new_vm().await; + compile_repl(&vm) + .await + .unwrap_or_else(|err| panic!("{}", err)); // pattern with field names out of order eval_line_(vm.clone(), r#"let {y, x} = {x = "x", y = "y"}"#) - .wait() + .await .expect("Error evaluating let binding"); let x: String = vm.get_global("x").expect("Error getting x"); assert_eq!(x, "x"); @@ -700,59 +709,70 @@ mod tests { // pattern with field names out of order and different field types eval_line_(vm.clone(), r#"let {y} = {x = "x", y = ()}"#) - .wait() + .await .expect("Error evaluating let binding 2"); let () = vm.get_global("y").expect("Error getting y"); } type QueryFn = fn(&'static str) -> IO>; - #[test] - fn type_of_expr() { - let _ = ::env_logger::try_init(); - let vm = new_vm(); - compile_repl(&vm).unwrap_or_else(|err| panic!("{}", err)); + #[tokio::test] + async fn type_of_expr() { + let _ = env_logger::try_init(); + let vm = new_vm().await; + compile_repl(&vm) + .await + .unwrap_or_else(|err| panic!("{}", err)); let mut type_of: FunctionRef = vm.get_global("repl.prim.type_of_expr").unwrap(); - assert_eq!(type_of.call("123"), Ok(IO::Value(Ok("Int".into())))); + assert_eq!( + type_of.call_async("123").await, + Ok(IO::Value(Ok("Int".into()))) + ); } - #[test] - fn find_kind() { - let _ = ::env_logger::try_init(); - let vm = new_vm(); - compile_repl(&vm).unwrap_or_else(|err| panic!("{}", err)); + #[tokio::test] + async fn find_kind() { + let _ = env_logger::try_init(); + let vm = new_vm().await; + compile_repl(&vm) + .await + .unwrap_or_else(|err| panic!("{}", err)); let mut find_kind: FunctionRef = vm.get_global("repl.prim.find_kind").unwrap(); assert_eq!( - find_kind.call("std.prelude.Semigroup"), + find_kind.call_async("std.prelude.Semigroup").await, Ok(IO::Value(Ok("Type -> Type".into()))) ); } - #[test] - fn find_info() { - let _ = ::env_logger::try_init(); - let vm = new_vm(); - compile_repl(&vm).unwrap_or_else(|err| panic!("{}", err)); + #[tokio::test] + async fn find_info() { + let _ = env_logger::try_init(); + let vm = new_vm().await; + compile_repl(&vm) + .await + .unwrap_or_else(|err| panic!("{}", err)); let mut find_info: FunctionRef = vm.get_global("repl.prim.find_info").unwrap(); - match find_info.call("std.prelude.Semigroup") { + match find_info.call_async("std.prelude.Semigroup").await { Ok(IO::Value(Ok(_))) => (), x => assert!(false, "{:?}", x), } - match find_info.call("std.prelude.empty") { + match find_info.call_async("std.prelude.empty").await { Ok(IO::Value(Ok(_))) => (), x => assert!(false, "{:?}", x), } - match find_info.call("std.float.prim") { + match find_info.call_async("std.float.prim").await { Ok(IO::Value(Ok(_))) => (), x => assert!(false, "{:?}", x), } } - #[test] - fn complete_repl_empty() { - let _ = ::env_logger::try_init(); - let vm = new_vm(); - compile_repl(&vm).unwrap_or_else(|err| panic!("{}", err)); + #[tokio::test] + async fn complete_repl_empty() { + let _ = env_logger::try_init(); + let vm = new_vm().await; + compile_repl(&vm) + .await + .unwrap_or_else(|err| panic!("{}", err)); complete(&vm, "", "", 0).unwrap_or_else(|err| panic!("{}", err)); } } diff --git a/src/compiler_pipeline.rs b/src/compiler_pipeline.rs index ec3c1fc7f9..fbcc92389c 100644 --- a/src/compiler_pipeline.rs +++ b/src/compiler_pipeline.rs @@ -7,75 +7,83 @@ //! typechecking (`TypecheckValue`) can be used as input to the next stage, ensuring that it is //! difficult to forget a stage. -use std::borrow::{Borrow, BorrowMut}; -use std::mem; -use std::result::Result as StdResult; -use std::sync::Arc; +use std::{ + borrow::{Borrow, BorrowMut, Cow}, + result::Result as StdResult, + sync::Arc, +}; #[cfg(feature = "serde")] use either::Either; -use futures::{future, Future}; - -use crate::base::{ - ast::{SpannedExpr, Typed}, - error::{Errors, InFile}, - fnv::FnvMap, - metadata::Metadata, - resolve, - symbol::{Name, NameBuf, Symbol, SymbolData, SymbolModule}, - types::{ArcType, NullInterner, Type, TypeCache}, -}; - -use crate::check::{metadata, rename}; - -use crate::vm::{ - compiler::CompiledModule, - core::{self, interpreter, CoreExpr}, - macros::MacroExpander, - thread::{RootedThread, RootedValue, Thread, ThreadInternal, VmRoot}, +use futures::prelude::*; +use salsa::ParallelDatabase; + +use crate::{ + base::{ + ast::{SpannedExpr, Typed}, + error::{Errors, InFile}, + fnv::FnvMap, + metadata::Metadata, + resolve, + symbol::{Name, NameBuf, Symbol, SymbolModule}, + types::{ArcType, NullInterner, Type, TypeCache}, + }, + check::{metadata, rename}, + query::{Compilation, CompilerDatabase}, + vm::{ + compiler::CompiledModule, + core::{self, interpreter, CoreExpr}, + macros::MacroExpander, + thread::{RootedThread, RootedValue, Thread, ThreadInternal, VmRoot}, + }, + Error, ModuleCompiler, Result, }; -use crate::{query::Compilation, Error, ModuleCompiler, Result}; - -pub type BoxFuture<'vm, T, E> = Box + Send + 'vm>; +pub type BoxFuture<'vm, T, E> = + std::pin::Pin> + Send + 'vm>>; pub type SalvageResult = StdResult, E)>; -fn join_result( - result: SalvageResult, - f: impl FnOnce(&mut T) -> SalvageResult, - join: impl FnOnce(T) -> U, -) -> SalvageResult { - let mut first_error = None; - let mut x = match result { - Ok(x) => x, - Err((Some(expr), err)) => { - first_error = Some(err); - expr +fn call(v: T, f: impl FnOnce(T) -> U) -> U { + f(v) +} + +macro_rules! join_result { + ($result: expr, $f: expr, $join: expr $(,)?) => {{ + let mut first_error = None; + let mut x = match $result { + Ok(x) => x, + Err((Some(expr), err)) => { + first_error = Some(err); + expr + } + Err((None, err)) => return Err((None, err)), + }; + let result = call(&mut x, $f) + .await + .map(|_| ()) + .map_err(|(value, err)| (value.map(|_| ()), err)); + if let Err((value, err)) = result { + return Err(( + value.map(|_| call(x, $join)), + if first_error.is_some() { + Errors::from(first_error.into_iter().chain(Some(err)).collect::>()) + .into() + } else { + err + }, + )); } - Err((None, err)) => return Err((None, err.into())), - }; - let result = f(&mut x) - .map(|_| ()) - .map_err(|(value, err)| (value.map(|_| ()), err)); - if let Err((value, err)) = result { - return Err(( - value.map(|_| join(x)), - if first_error.is_some() { - Errors::from(first_error.into_iter().chain(Some(err)).collect::>()).into() - } else { - err - }, - )); - } - match first_error { - Some(err) => Err((Some(join(x)), err)), - None => Ok(join(x)), - } + let v = call(x, $join); + match first_error { + Some(err) => Err((Some(v), err)), + None => Ok(v), + } + }}; } pub fn parse_expr( - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, type_cache: &TypeCache, file: &str, expr_str: &str, @@ -99,82 +107,94 @@ pub struct MacroValue { pub expr: E, } +#[async_trait::async_trait] pub trait MacroExpandable { type Expr: BorrowMut>; - fn expand_macro( + async fn expand_macro( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, - ) -> SalvageResult> - where - Self: Sized, - { - let mut macros = MacroExpander::new(thread, compiler.database); - let expr = self.expand_macro_with(compiler, &mut macros, file, expr_str)?; - if let Err(err) = macros.finish() { - return Err(( - Some(expr), - InFile::new(compiler.code_map().clone(), err).into(), - )); - } - Ok(expr) - } - - fn expand_macro_with( - self, - compiler: &mut ModuleCompiler, - macros: &mut MacroExpander, - file: &str, - expr_str: &str, ) -> SalvageResult>; } +#[async_trait::async_trait] impl<'s> MacroExpandable for &'s str { type Expr = SpannedExpr; - fn expand_macro_with( + async fn expand_macro( self, - compiler: &mut ModuleCompiler, - macros: &mut MacroExpander, + compiler: &mut ModuleCompiler<'_>, + thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { - join_result( - parse_expr(compiler, macros.vm.global_env().type_cache(), file, self) + join_result!( + parse_expr(compiler, thread.global_env().type_cache(), file, self) .map_err(|(x, err)| (x, err.into())), |expr| { - expr.expand_macro_with(compiler, macros, file, expr_str) - .map(|_| ()) - .map_err(|(opt, err)| (opt.map(|_| ()), err)) + async move { + expr.expand_macro(compiler, thread, file, expr_str) + .map_ok(|_| ()) + .map_err(|(opt, err)| (opt.map(|_| ()), err)) + .await + } }, |expr| MacroValue { expr }, ) } } +#[async_trait::async_trait] impl<'s> MacroExpandable for &'s mut SpannedExpr { type Expr = &'s mut SpannedExpr; - fn expand_macro_with( + async fn expand_macro( self, - compiler: &mut ModuleCompiler, - macros: &mut MacroExpander, + compiler: &mut ModuleCompiler<'_>, + thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { if compiler.compiler_settings().implicit_prelude && !expr_str.starts_with("//@NO-IMPLICIT-PRELUDE") { - compiler.include_implicit_prelude(macros.vm.global_env().type_cache(), file, self); + compiler.include_implicit_prelude(thread.global_env().type_cache(), file, self); } - let prev_errors = mem::replace(&mut macros.errors, Errors::new()); - macros.run(&mut compiler.symbols, self); - let errors = mem::replace(&mut macros.errors, prev_errors); + + let result = { + struct Forker<'a>(salsa::Forker<'a, CompilerDatabase>); + impl vm::macros::MacroUserdata for Forker<'_> { + fn fork(&self, thread: RootedThread) -> Box { + Box::new(self.0.db.fork(self.0.state.clone(), thread)) + } + } + let mut forker = Forker(compiler.database.forker()); + + let spawn = if tokio_executor::enter().is_err() { + struct TokioSpawn; + impl futures::task::Spawn for TokioSpawn { + fn spawn_obj( + &self, + future: futures::task::FutureObj<'static, ()>, + ) -> StdResult<(), futures::task::SpawnError> { + tokio::spawn(future); + Ok(()) + } + } + Some(&TokioSpawn as &(dyn futures::task::Spawn + Send + Sync)) + } else { + None + }; + + let mut macros = MacroExpander::new(thread, &mut forker, spawn); + macros.run(&mut compiler.symbols, self).await; + macros.finish() + }; let value = MacroValue { expr: self }; - if errors.has_errors() { + if let Err(errors) = result { Err(( Some(value), InFile::new(compiler.code_map().clone(), errors).into(), @@ -185,18 +205,20 @@ impl<'s> MacroExpandable for &'s mut SpannedExpr { } } +#[async_trait::async_trait] impl MacroExpandable for SpannedExpr { type Expr = SpannedExpr; - fn expand_macro_with( + async fn expand_macro( mut self, - compiler: &mut ModuleCompiler, - macros: &mut MacroExpander, + compiler: &mut ModuleCompiler<'_>, + thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { let result = (&mut self) - .expand_macro_with(compiler, macros, file, expr_str) + .expand_macro(compiler, thread, file, expr_str) + .await .map(|_| ()) .map_err(|(_, err)| err); @@ -212,39 +234,42 @@ pub struct Renamed { pub expr: E, } +#[async_trait::async_trait] pub trait Renameable: Sized { type Expr: BorrowMut>; - fn rename( + async fn rename( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult>; } +#[async_trait::async_trait] impl Renameable for T where - T: MacroExpandable, + T: MacroExpandable + Send, + T::Expr: Send, { type Expr = T::Expr; - fn rename( + async fn rename( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { - join_result( - self.expand_macro(compiler, thread, file, expr_str), + join_result!( + self.expand_macro(compiler, thread, file, expr_str).await, |MacroValue { expr }| { MacroValue { expr: expr.borrow_mut(), } .rename(compiler, thread, file, expr_str) - .map(|_| ()) + .map_ok(|_| ()) .map_err(|(opt, err)| (opt.map(|_| ()), err)) }, |MacroValue { expr }| Renamed { expr }, @@ -252,15 +277,16 @@ where } } +#[async_trait::async_trait] impl Renameable for MacroValue where - E: BorrowMut>, + E: BorrowMut> + Send, { type Expr = E; - fn rename( + async fn rename( mut self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, _thread: &Thread, file: &str, expr_str: &str, @@ -278,33 +304,36 @@ pub struct WithMetadata { pub metadata: Arc, } +#[async_trait::async_trait] pub trait MetadataExtractable: Sized { type Expr: BorrowMut>; - fn extract_metadata( + async fn extract_metadata( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult>; } +#[async_trait::async_trait] impl MetadataExtractable for T where - T: Renameable, + T: Renameable + Send, + T::Expr: Send, { type Expr = T::Expr; - fn extract_metadata( + async fn extract_metadata( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { let mut macro_error = None; - let expr = match self.rename(compiler, thread, file, expr_str) { + let expr = match self.rename(compiler, thread, file, expr_str).await { Ok(expr) => expr, Err((Some(expr), err)) => { macro_error = Some(err); @@ -312,7 +341,10 @@ where } Err((None, err)) => return Err((None, err)), }; - match expr.extract_metadata(compiler, thread, file, expr_str) { + match expr + .extract_metadata(compiler, thread, file, expr_str) + .await + { Ok(value) => match macro_error { Some(err) => return Err((Some(value), err)), None => Ok(value), @@ -325,20 +357,21 @@ where } } +#[async_trait::async_trait] impl MetadataExtractable for Renamed where - E: BorrowMut>, + E: BorrowMut> + Send, { type Expr = E; - fn extract_metadata( + async fn extract_metadata( mut self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, _thread: &Thread, _file: &str, _expr_str: &str, ) -> SalvageResult> { - let env = compiler.database; + let env = &*compiler.database; let (metadata, metadata_map) = metadata::metadata(env, self.expr.borrow_mut()); Ok(WithMetadata { expr: self.expr, @@ -355,33 +388,39 @@ pub struct InfixReparsed { pub metadata: Arc, } +#[async_trait::async_trait] pub trait InfixReparseable: Sized { type Expr: BorrowMut>; - fn reparse_infix( + async fn reparse_infix( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult>; } +#[async_trait::async_trait] impl InfixReparseable for T where - T: MetadataExtractable, + T: MetadataExtractable + Send, + T::Expr: Send, { type Expr = T::Expr; - fn reparse_infix( + async fn reparse_infix( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { let mut macro_error = None; - let expr = match self.extract_metadata(compiler, thread, file, expr_str) { + let expr = match self + .extract_metadata(compiler, thread, file, expr_str) + .await + { Ok(expr) => expr, Err((Some(expr), err)) => { macro_error = Some(err); @@ -389,7 +428,7 @@ where } Err((None, err)) => return Err((None, err)), }; - match expr.reparse_infix(compiler, thread, file, expr_str) { + match expr.reparse_infix(compiler, thread, file, expr_str).await { Ok(value) => match macro_error { Some(err) => return Err((Some(value), err)), None => Ok(value), @@ -402,15 +441,16 @@ where } } +#[async_trait::async_trait] impl InfixReparseable for WithMetadata where - E: BorrowMut>, + E: BorrowMut> + Send, { type Expr = E; - fn reparse_infix( + async fn reparse_infix( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, _thread: &Thread, _file: &str, _expr_str: &str, @@ -466,21 +506,23 @@ impl TypecheckValue { } } +#[async_trait::async_trait] pub trait Typecheckable: Sized { type Expr: BorrowMut>; - fn typecheck( + async fn typecheck( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, ) -> SalvageResult> { self.typecheck_expected(compiler, thread, file, expr_str, None) + .await } - fn typecheck_expected( + async fn typecheck_expected( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, @@ -488,22 +530,24 @@ pub trait Typecheckable: Sized { ) -> SalvageResult>; } +#[async_trait::async_trait] impl Typecheckable for T where - T: InfixReparseable, + T: InfixReparseable + Send, + T::Expr: Send, { type Expr = T::Expr; - fn typecheck_expected( + async fn typecheck_expected( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, expected_type: Option<&ArcType>, ) -> SalvageResult> { let mut macro_error = None; - let expr = match self.reparse_infix(compiler, thread, file, expr_str) { + let expr = match self.reparse_infix(compiler, thread, file, expr_str).await { Ok(expr) => expr, Err((Some(expr), err)) => { macro_error = Some(err); @@ -511,7 +555,10 @@ where } Err((None, err)) => return Err((None, err)), }; - match expr.typecheck_expected(compiler, thread, file, expr_str, expected_type) { + match expr + .typecheck_expected(compiler, thread, file, expr_str, expected_type) + .await + { Ok(value) => match macro_error { Some(err) => return Err((Some(value), err)), None => Ok(value), @@ -526,18 +573,18 @@ where fn typecheck_expr( expr: &mut SpannedExpr, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expected_type: Option<&ArcType>, metadata_map: &mut FnvMap>, ) -> Result { use crate::check::typecheck::Typecheck; - let env = compiler.database; + let env = &*compiler.database; let mut tc = Typecheck::new( file.into(), &mut compiler.symbols, - &env, + &*env, &thread.global_env().type_cache(), metadata_map, ); @@ -546,15 +593,16 @@ fn typecheck_expr( .map_err(|err| InFile::new(compiler.database.state().code_map.clone(), err).into()) } +#[async_trait::async_trait] impl Typecheckable for InfixReparsed where - E: BorrowMut>, + E: BorrowMut> + Send, { type Expr = E; - fn typecheck_expected( + async fn typecheck_expected( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, _expr_str: &str, @@ -582,7 +630,7 @@ where Some(TypecheckValue { typ: expr .borrow_mut() - .try_type_of(&compiler.database) + .try_type_of(&*compiler.database) .unwrap_or_else(|_| thread.global_env().type_cache().error()), expr, metadata_map, @@ -595,8 +643,8 @@ where // Some metadata requires typechecking so recompute it if full metadata is required let (metadata, metadata_map) = if compiler.compiler_settings().full_metadata { - let env = compiler.database; - metadata::metadata(&env, expr.borrow_mut()) + let env = &*compiler.database; + metadata::metadata(&*env, expr.borrow_mut()) } else { (metadata, metadata_map) }; @@ -639,53 +687,68 @@ impl CompileValue { } } +#[async_trait::async_trait] pub trait Compileable { type Expr; - fn compile( + async fn compile( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, arg: Extra, - ) -> Result>; + ) -> Result> + where + Extra: 'async_trait; } + +#[async_trait::async_trait] impl<'a, 'b, T> Compileable> for T where - T: Typecheckable, + T: Typecheckable + Send, + T::Expr: Send + Sync, { type Expr = T::Expr; - fn compile( + async fn compile( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, expected_type: Option<&'b ArcType>, ) -> Result> { - self.typecheck_expected(compiler, thread, file, expr_str, expected_type) - .map_err(|(_, err)| err) - .and_then(|tc_value| tc_value.compile(compiler, thread, file, expr_str, ())) + let tc_value = self + .typecheck_expected(compiler, thread, file, expr_str, expected_type) + .await + .map_err(|(_, err)| err)?; + tc_value.compile(compiler, thread, file, expr_str, ()).await } } + +#[async_trait::async_trait] impl Compileable for TypecheckValue where - E: Borrow>, + E: Borrow> + Send + Sync, + Extra: Send, { type Expr = E; - fn compile( + async fn compile( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, filename: &str, expr_str: &str, extra: Extra, - ) -> Result> { + ) -> Result> + where + Extra: 'async_trait, + { (&self) .compile(compiler, thread, filename, expr_str, extra) + .await .map(|value| value.map(|_| ())) .map( |CompileValue { @@ -705,20 +768,25 @@ where } } +#[async_trait::async_trait] impl<'e, E, Extra> Compileable for &'e TypecheckValue where - E: Borrow>, + E: Borrow> + Send + Sync, + Extra: Send, { type Expr = &'e E; - fn compile( + async fn compile( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, filename: &str, _expr_str: &str, _: Extra, - ) -> Result> { + ) -> Result> + where + Extra: 'async_trait, + { use crate::vm::compiler::Compiler; info!("Compile `{}`", filename); @@ -728,9 +796,9 @@ where let core_expr; let mut module = { - let env = compiler.database; + let env = &*compiler.database; - core_expr = core::with_translator(&env, |translator| { + core_expr = core::with_translator(&*env, |translator| { let expr = translator.translate_expr(self.expr.borrow()); debug!("Translation returned: {}", expr); @@ -759,7 +827,7 @@ where ); let mut compiler = Compiler::new( - &env, + &*env, thread.global_env(), symbols, &source, @@ -791,87 +859,103 @@ where pub value: RootedValue, } +#[async_trait::async_trait] pub trait Executable<'vm, Extra> { type Expr; - fn run_expr( + async fn run_expr( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: T, name: &str, expr_str: &str, arg: Extra, - ) -> BoxFuture<'vm, ExecuteValue, Error> + ) -> Result> where - T: Send + VmRoot<'vm>; + T: Send + Sync + VmRoot<'vm>, + Extra: 'async_trait, + 'vm: 'async_trait; - fn load_script( + async fn load_script( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: T, filename: &str, expr_str: &str, arg: Extra, - ) -> BoxFuture<'vm, (), Error> + ) -> Result<()> where - T: Send + VmRoot<'vm>; + T: Send + Sync + VmRoot<'vm>, + Extra: 'async_trait, + 'vm: 'async_trait; } + +#[async_trait::async_trait] impl<'vm, C, Extra> Executable<'vm, Extra> for C where - C: Compileable, + C: Compileable + Send, C::Expr: Send + 'vm, + Extra: Send, { type Expr = C::Expr; - fn run_expr( + async fn run_expr( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: T, name: &str, expr_str: &str, arg: Extra, - ) -> BoxFuture<'vm, ExecuteValue, Error> + ) -> Result> where - T: Send + VmRoot<'vm>, + T: Send + Sync + VmRoot<'vm>, + 'vm: 'async_trait, + Extra: 'async_trait, { - match self.compile(compiler, &vm, name, expr_str, arg) { - Ok(v) => v.run_expr(compiler, vm, name, expr_str, ()), - Err(err) => Box::new(future::err(err)), + match self.compile(compiler, &vm, name, expr_str, arg).await { + Ok(v) => v.run_expr(compiler, vm, name, expr_str, ()).await, + Err(err) => Err(err), } } - fn load_script( + + async fn load_script( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: T, filename: &str, expr_str: &str, arg: Extra, - ) -> BoxFuture<'vm, (), Error> + ) -> Result<()> where - T: Send + VmRoot<'vm>, + T: Send + Sync + VmRoot<'vm>, + Extra: 'async_trait, + 'vm: 'async_trait, { - match self.compile(compiler, &vm, filename, expr_str, arg) { - Ok(v) => v.load_script(compiler, vm, filename, expr_str, ()), - Err(err) => Box::new(future::err(err)), + match self.compile(compiler, &vm, filename, expr_str, arg).await { + Ok(v) => v.load_script(compiler, vm, filename, expr_str, ()).await, + Err(err) => Err(err), } } } + +#[async_trait::async_trait] impl<'vm, E> Executable<'vm, ()> for CompileValue where E: Send + 'vm, { type Expr = E; - fn run_expr( + async fn run_expr( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: T, name: &str, _expr_str: &str, _: (), - ) -> BoxFuture<'vm, ExecuteValue, Error> + ) -> Result> where - T: Send + VmRoot<'vm>, + T: Send + Sync + VmRoot<'vm>, + 'vm: 'async_trait, { let CompileValue { expr, @@ -883,49 +967,50 @@ where let run_io = compiler.database.compiler_settings().run_io; let module_id = Symbol::from(format!("@{}", name)); module.function.id = module_id.clone(); - let closure = try_future!(vm.global_env().new_global_thunk(&vm, module)); + let closure = vm.global_env().new_global_thunk(&vm, module)?; let vm1 = vm.clone(); - Box::new( - vm1.call_thunk_top(&closure) - .map(move |value| ExecuteValue { - id: module_id, - expr, - typ, - value, - metadata, - }) - .map_err(Error::from) - .and_then(move |v| { + vm1.call_thunk_top(&closure) + .map_ok(move |value| ExecuteValue { + id: module_id, + expr, + typ, + value, + metadata, + }) + .map_err(Error::from) + .and_then(move |v| { + async move { if run_io { - future::Either::B(crate::compiler_pipeline::run_io(vm, v)) + crate::compiler_pipeline::run_io(vm, v).await } else { - future::Either::A(future::ok(v)) + Ok(v) } - }), - ) + } + }) + .await } - fn load_script( + + async fn load_script( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, _vm: T, filename: &str, expr_str: &str, _: (), - ) -> BoxFuture<'vm, (), Error> + ) -> Result<()> where - T: Send + VmRoot<'vm>, + T: Send + Sync + VmRoot<'vm>, + 'vm: 'async_trait, { let filename = filename.to_string(); compiler .state() .inline_modules - .insert(filename.clone(), expr_str.into()); + .insert(filename.clone(), Arc::new(Cow::Owned(expr_str.into()))); - Box::new(future::result( - compiler.database.import(filename.into()).map(|_| ()), - )) + compiler.database.import(filename.into()).await.map(|_| ()) } } @@ -961,88 +1046,89 @@ pub struct Module { } #[cfg(feature = "serde")] -impl<'vm, 'de, D> Executable<'vm, ()> for Precompiled +#[async_trait::async_trait] +impl<'vm, D> Executable<'vm, ()> for Precompiled where - D: crate::serde::Deserializer<'de>, + D: crate::serde::Deserializer<'vm> + Send, { type Expr = (); - fn run_expr( + async fn run_expr( self, - _compiler: &mut ModuleCompiler, + _compiler: &mut ModuleCompiler<'_>, vm: T, filename: &str, _expr_str: &str, _: (), - ) -> BoxFuture<'vm, ExecuteValue, Error> + ) -> Result> where - T: Send + VmRoot<'vm>, + T: Send + Sync + VmRoot<'vm>, + 'vm: 'async_trait, { use crate::vm::serialization::DeSeed; - let module: Module = try_future!(DeSeed::new(&vm, &mut vm.current_context()) + let module: Module = DeSeed::new(&vm, &mut vm.current_context()) .deserialize(self.0) - .map_err(|err| err.to_string())); + .map_err(|err| err.to_string())?; let module_id = module.module.function.id.clone(); if filename != module_id.as_ref() { - return Box::new(future::err( - format!("filenames do not match `{}` != `{}`", filename, module_id).into(), - )); + return Err(format!("filenames do not match `{}` != `{}`", filename, module_id).into()); } let typ = module.typ; let metadata = module.metadata; - let closure = try_future!(vm.global_env().new_global_thunk(&vm, module.module)); - Box::new( - vm.call_thunk_top(&closure) - .map(move |value| ExecuteValue { - id: module_id, - expr: (), - typ: typ, - metadata, - value, - }) - .map_err(Error::from), - ) + let closure = vm.global_env().new_global_thunk(&vm, module.module)?; + vm.call_thunk_top(&closure) + .map_ok(move |value| ExecuteValue { + id: module_id, + expr: (), + typ: typ, + metadata, + value, + }) + .map_err(Error::from) + .await } - fn load_script( + async fn load_script( self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: T, name: &str, _expr_str: &str, _: (), - ) -> BoxFuture<'vm, (), Error> + ) -> Result<()> where - T: Send + VmRoot<'vm>, + T: Send + Sync + VmRoot<'vm>, + 'vm: 'async_trait, { use crate::vm::internal::Global; use crate::vm::serialization::DeSeed; + use base::symbol::SymbolData; let Global { metadata, typ, value, id: _, - } = try_future!(DeSeed::new(&vm, &mut vm.current_context()) + } = DeSeed::new(&vm, &mut vm.current_context()) .deserialize(self.0) - .map_err(|err| err.to_string())); + .map_err(|err| err.to_string())?; let id = compiler.symbols.symbol(SymbolData { global: true, location: None, name: name, }); - try_future!(vm.set_global(id, typ, metadata.clone(), &value,)); + vm.set_global(id, typ, metadata.clone(), &value)?; info!("Loaded module `{}`", name); - Box::new(future::ok(())) + Ok(()) } } #[cfg(feature = "serde")] -pub fn compile_to( +pub async fn compile_to( self_: T, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, thread: &Thread, file: &str, expr_str: &str, @@ -1064,6 +1150,7 @@ where module, } = self_ .compile(compiler, thread, file, expr_str, arg) + .await .map_err(Error::from) .map_err(Either::Left)?; let module = Module { @@ -1076,10 +1163,10 @@ where .map_err(Either::Right) } -pub fn run_io<'vm, T, E>( +pub async fn run_io<'vm, T, E>( vm: T, v: ExecuteValue, -) -> impl Future, Error = Error> +) -> Result> where E: Send + 'vm, T: Send + VmRoot<'vm>, @@ -1098,27 +1185,25 @@ where } = v; let vm1 = vm.clone(); - future::Either::B( - vm1.execute_io_top(value.get_variant()) - .map(move |value| { - // The type of the new value will be `a` instead of `IO a` - let actual = - resolve::remove_aliases_cow(&vm.get_env(), &mut NullInterner, &typ); - let actual = match **actual { - Type::App(_, ref arg) => arg[0].clone(), - _ => ice!("ICE: Expected IO type found: `{}`", actual), - }; - ExecuteValue { - id, - expr, - value, - metadata, - typ: actual, - } - }) - .map_err(Error::from), - ) + vm1.execute_io_top(value.get_variant()) + .map_ok(move |value| { + // The type of the new value will be `a` instead of `IO a` + let actual = resolve::remove_aliases_cow(&vm.get_env(), &mut NullInterner, &typ); + let actual = match **actual { + Type::App(_, ref arg) => arg[0].clone(), + _ => ice!("ICE: Expected IO type found: `{}`", actual), + }; + ExecuteValue { + id, + expr, + value, + metadata, + typ: actual, + } + }) + .map_err(Error::from) + .await } else { - future::Either::A(future::ok(v)) + Ok(v) } } diff --git a/src/import.rs b/src/import.rs index e451604826..c373294db0 100644 --- a/src/import.rs +++ b/src/import.rs @@ -11,9 +11,13 @@ use std::{ sync::{Arc, Mutex, MutexGuard, RwLock}, }; -use futures::future; +use async_trait::async_trait; +use futures::{ + future::{self, BoxFuture}, + prelude::*, + task::SpawnExt, +}; use itertools::Itertools; -use salsa::ParallelDatabase; use crate::base::{ ast::{expr_to_path, Expr, Literal, SpannedExpr}, @@ -73,10 +77,11 @@ impl base::error::AsDiagnostic for Error { include!(concat!(env!("OUT_DIR"), "/std_modules.rs")); +#[async_trait] pub trait Importer: Any + Clone + Sync + Send { - fn import( + async fn import( &self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: &Thread, modulename: &str, ) -> Result, crate::Error)>; @@ -84,16 +89,18 @@ pub trait Importer: Any + Clone + Sync + Send { #[derive(Clone)] pub struct DefaultImporter; +#[async_trait] impl Importer for DefaultImporter { - fn import( + async fn import( &self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, _vm: &Thread, modulename: &str, ) -> Result, crate::Error)> { let value = compiler .database .global(modulename.to_string()) + .await .map_err(|err| (None, err))?; Ok(value.typ) } @@ -101,7 +108,7 @@ impl Importer for DefaultImporter { enum UnloadedModule { Source, - Extern(ExternModule), + Extern(Vec), } pub struct DatabaseSnapshot { @@ -115,6 +122,29 @@ impl Deref for DatabaseSnapshot { } } +impl DerefMut for DatabaseSnapshot { + fn deref_mut(&mut self) -> &mut Self::Target { + self.snapshot.as_mut().unwrap() + } +} + +pub struct DatabaseFork { + fork: Option>, +} + +impl Deref for DatabaseFork { + type Target = CompilerDatabase; + fn deref(&self) -> &Self::Target { + self.fork.as_ref().unwrap() + } +} + +impl DerefMut for DatabaseFork { + fn deref_mut(&mut self) -> &mut Self::Target { + self.fork.as_mut().unwrap() + } +} + pub struct DatabaseMut { // Only needed to ensure that the the `Compiler` the guard points to lives long enough _import: Arc, @@ -144,22 +174,29 @@ impl DerefMut for DatabaseMut { } } -pub(crate) trait ImportApi { +#[async_trait] +pub(crate) trait ImportApi: Send + Sync { fn get_module_source( &self, use_standard_lib: bool, module: &str, filename: &str, ) -> Result, Error>; - fn load_module( + async fn load_module( &self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: &Thread, module_id: &Symbol, ) -> Result, MacroError)>; fn snapshot(&self, thread: RootedThread) -> DatabaseSnapshot; + fn fork( + &self, + forker: Arc>, + thread: RootedThread, + ) -> DatabaseFork; } +#[async_trait] impl ImportApi for Import where I: Importer, @@ -172,17 +209,24 @@ where ) -> Result, Error> { Self::get_module_source(self, use_standard_lib, module, filename) } - fn load_module( + async fn load_module( &self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: &Thread, module_id: &Symbol, ) -> Result, MacroError)> { - Self::load_module(self, compiler, vm, module_id) + Self::load_module(self, compiler, vm, module_id).await } fn snapshot(&self, thread: RootedThread) -> DatabaseSnapshot { Self::snapshot(self, thread) } + fn fork( + &self, + forker: Arc>, + thread: RootedThread, + ) -> DatabaseFork { + Self::fork(self, forker, thread) + } } /// Macro which rewrites occurances of `import! "filename"` to a load of that file if it is not @@ -251,30 +295,31 @@ impl Import { } pub fn snapshot(&self, thread: RootedThread) -> DatabaseSnapshot { - self.snapshot_(Some(thread)) - } - - fn snapshot_(&self, thread: Option) -> DatabaseSnapshot { - let mut compiler = self.compiler.lock().unwrap(); - - compiler.thread = thread; - let snapshot = compiler.snapshot(); - compiler.thread = None; + let snapshot = self.compiler.lock().unwrap().snapshot(thread); DatabaseSnapshot { snapshot: Some(snapshot), } } - fn get_unloaded_module(&self, vm: &Thread, module: &str) -> Result { + pub fn fork( + &self, + forker: Arc>, + thread: RootedThread, + ) -> DatabaseFork { + let fork = self.compiler.lock().unwrap().fork(forker, thread); + + DatabaseFork { fork: Some(fork) } + } + + fn get_unloaded_module(&self, module: &str) -> UnloadedModule { { - let mut loaders = self.loaders.write().unwrap(); - if let Some(loader) = loaders.get_mut(module) { - let value = loader(vm).map_err(MacroError::new)?; - return Ok(UnloadedModule::Extern(value)); + let loaders = self.loaders.read().unwrap(); + if let Some(loader) = loaders.get(module) { + return UnloadedModule::Extern(loader.dependencies.clone()); } } - Ok(UnloadedModule::Source) + UnloadedModule::Source } pub(crate) fn get_module_source( @@ -324,9 +369,9 @@ impl Import { }) } - pub fn load_module( + pub async fn load_module( &self, - compiler: &mut ModuleCompiler, + compiler: &mut ModuleCompiler<'_>, vm: &Thread, module_id: &Symbol, ) -> Result, MacroError)> @@ -337,16 +382,32 @@ impl Import { let modulename = module_id.name().definition_name(); // Retrieve the source, first looking in the standard library included in the // binary - let unloaded_module = self - .get_unloaded_module(vm, &modulename) - .map_err(|err| (None, MacroError::new(err)))?; + let unloaded_module = self.get_unloaded_module(&modulename); Ok(match unloaded_module { - UnloadedModule::Extern(ExternModule { - value, - typ, - metadata, - }) => { + UnloadedModule::Extern(dependencies) => { + for dep in dependencies { + let dep_id = Symbol::from(if dep.starts_with('@') { + dep + } else { + format!("@{}", dep) + }); + self.load_module_boxed(compiler, vm, &dep_id).await?; + } + + let ExternModule { + value, + typ, + metadata, + } = (self + .loaders + .write() + .unwrap() + .get_mut(modulename) + .expect("bug: Missing loader but it was already seen in get_unloaded_module") + .load_fn)(vm) + .map_err(|err| (None, MacroError::new(err)))?; + vm.set_global( module_id.clone(), typ.clone(), @@ -359,9 +420,22 @@ impl Import { UnloadedModule::Source => self .importer .import(compiler, vm, &modulename) + .await .map_err(|(t, err)| (t, MacroError::new(err)))?, }) } + + fn load_module_boxed<'a, 'b>( + &'a self, + compiler: &'a mut ModuleCompiler<'b>, + vm: &'a Thread, + module_id: &'a Symbol, + ) -> BoxFuture<'a, Result, MacroError)>> + where + I: Importer, + { + self.load_module(compiler, vm, module_id).boxed() + } } /// Adds an extern module to `thread`, letting it be loaded with `import! name` from gluon code. @@ -410,7 +484,32 @@ pub fn add_extern_module(thread: &Thread, name: &str, loader: F) where F: FnMut(&Thread) -> vm::Result + Send + Sync + 'static, { - add_extern_module_(thread, name, Box::new(loader)) + add_extern_module_( + thread, + name, + ExternLoader { + load_fn: Box::new(loader), + dependencies: Vec::new(), + }, + ) +} + +pub fn add_extern_module_with_deps( + thread: &Thread, + name: &str, + loader: F, + dependencies: Vec, +) where + F: FnMut(&Thread) -> vm::Result + Send + Sync + 'static, +{ + add_extern_module_( + thread, + name, + ExternLoader { + load_fn: Box::new(loader), + dependencies, + }, + ) } fn add_extern_module_(thread: &Thread, name: &str, loader: ExternLoader) { @@ -431,10 +530,16 @@ macro_rules! add_extern_module_if { ( #[cfg($($features: tt)*)], available_if = $msg: expr, + $(dependencies = $dependencies: expr,)? args($vm: expr, $mod_name: expr, $loader: path) ) => {{ #[cfg($($features)*)] - $crate::import::add_extern_module($vm, $mod_name, $loader); + $crate::import::add_extern_module_with_deps( + $vm, + $mod_name, + $loader, + None.into_iter() $( .chain($dependencies.iter().cloned()) )? .map(|s: &str| s.into()).collect::>() + ); #[cfg(not($($features)*))] $crate::import::add_extern_module($vm, $mod_name, |_: &::vm::thread::Thread| -> ::vm::Result<::vm::ExternModule> { @@ -483,7 +588,11 @@ where } } - fn expand(&self, macros: &mut MacroExpander, args: Vec>) -> MacroFuture { + fn expand<'a>( + &self, + macros: &mut MacroExpander<'a>, + args: Vec>, + ) -> MacroFuture<'a> { fn get_module_name(args: &[SpannedExpr]) -> Result { if args.len() != 1 { return Err(Error::String("Expected import to get 1 argument".into()).into()); @@ -511,23 +620,45 @@ where let modulename = match get_module_name(&args).map_err(MacroError::new) { Ok(modulename) => modulename, - Err(err) => return Box::new(future::err(err)), + Err(err) => return Box::pin(future::err(err)), }; info!("import! {}", modulename); - let db = try_future!(macros - .user_data - .downcast_ref::() - .ok_or_else(|| MacroError::new(Error::String( + let mut db = try_future!(macros + .userdata + .fork(macros.vm.root_thread()) + .downcast::>() + .map_err(|_| MacroError::new(Error::String( "`import` requires a `CompilerDatabase` as user data during macro expansion".into(), )))); - Box::new(future::result( - db.import(modulename) - .map_err(|err| MacroError::message(err.to_string())) - .map(|expr| pos::spanned(args[0].span, expr)), - )) + let span = args[0].span; + + if let Some(spawn) = macros.spawn { + let (tx, rx) = tokio_sync::oneshot::channel(); + spawn + .spawn(Box::pin(async move { + let result = db + .import(modulename) + .map_err(|err| MacroError::message(err.to_string())) + .map_ok(move |expr| pos::spanned(span, expr)) + .await; + drop(db); // Drop the database before sending the result, otherwise the forker may drop before the forked database + let _ = tx.send(result); + })) + .unwrap(); + Box::pin(rx.map(|r| { + r.unwrap_or_else(|err| Err(MacroError::new(Error::String(err.to_string())))) + })) + } else { + Box::pin(async move { + db.import(modulename) + .map_err(|err| MacroError::message(err.to_string())) + .map_ok(move |expr| pos::spanned(span, expr)) + .await + }) + } } } diff --git a/src/lib.rs b/src/lib.rs index d06a7d1e2f..0c62cbe015 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -33,7 +33,7 @@ pub extern crate gluon_vm as vm; macro_rules! try_future { ($e:expr) => { - try_future!($e, Box::new) + try_future!($e, Box::pin) }; ($e:expr, $f:expr) => { match $e { @@ -53,7 +53,7 @@ pub mod std_lib; pub use crate::vm::thread::{RootedThread, Thread}; -use futures::{future, prelude::*}; +use futures::prelude::*; use either::Either; @@ -82,7 +82,7 @@ use crate::vm::{ use crate::{ compiler_pipeline::*, - import::{add_extern_module, DefaultImporter, Import}, + import::{add_extern_module, add_extern_module_with_deps, DefaultImporter, Import}, query::{Compilation, CompilationBase}, }; @@ -309,14 +309,29 @@ impl Default for Settings { } pub struct ModuleCompiler<'a> { - pub database: &'a query::CompilerDatabase, + pub database: &'a mut query::CompilerDatabase, symbols: Symbols, } +impl<'a> ModuleCompiler<'a> { + fn new(database: &'a mut query::CompilerDatabase) -> Self { + Self { + database, + symbols: Symbols::default(), + } + } +} + impl<'a> std::ops::Deref for ModuleCompiler<'a> { - type Target = &'a query::CompilerDatabase; + type Target = query::CompilerDatabase; fn deref(&self) -> &Self::Target { - &self.database + self.database + } +} + +impl<'a> std::ops::DerefMut for ModuleCompiler<'a> { + fn deref_mut(&mut self) -> &mut Self::Target { + self.database } } @@ -390,7 +405,9 @@ impl import::DatabaseMut { } /// Extension trait which provides methods to load and execute gluon code -pub trait ThreadExt { + +#[async_trait::async_trait] +pub trait ThreadExt: Send + Sync { fn get_database(&self) -> import::DatabaseSnapshot; fn get_database_mut(&self) -> import::DatabaseMut; @@ -401,11 +418,11 @@ pub trait ThreadExt { #[doc(hidden)] fn thread(&self) -> &Thread; - fn module_compiler<'a>(&'a self, database: &'a query::CompilerDatabase) -> ModuleCompiler<'a> { - ModuleCompiler { - database, - symbols: Default::default(), - } + fn module_compiler<'a>( + &'a self, + database: &'a mut query::CompilerDatabase, + ) -> ModuleCompiler<'a> { + ModuleCompiler::new(database) } /// Parse `expr_str`, returning an expression if successful @@ -428,7 +445,7 @@ pub trait ThreadExt { ) -> SalvageResult, InFile> { let vm = self.thread(); parse_expr( - &mut self.module_compiler(&vm.get_database()), + &mut ModuleCompiler::new(&mut vm.get_database()), type_cache, file, expr_str, @@ -437,7 +454,7 @@ pub trait ThreadExt { /// Parse and typecheck `expr_str` returning the typechecked expression and type of the /// expression - fn typecheck_expr( + async fn typecheck_expr( &self, file: &str, expr_str: &str, @@ -445,12 +462,13 @@ pub trait ThreadExt { ) -> Result { let vm = self.thread(); expr.typecheck_expected( - &mut self.module_compiler(&vm.get_database()), + &mut ModuleCompiler::new(&mut vm.get_database()), vm, file, expr_str, None, ) + .await .map(|result| result.typ) .map_err(|t| t.1) } @@ -460,22 +478,32 @@ pub trait ThreadExt { file: &str, expr_str: &str, expected_type: Option<&ArcType>, + ) -> Result<(Arc>, ArcType)> { + futures::executor::block_on(self.typecheck_str_async(file, expr_str, expected_type)) + } + + async fn typecheck_str_async( + &self, + file: &str, + expr_str: &str, + expected_type: Option<&ArcType>, ) -> Result<(Arc>, ArcType)> { let vm = self.thread(); { let mut db = vm.get_database_mut(); db.add_module(file.into(), expr_str.into()); } - let db = vm.get_database(); + let mut db = vm.get_database(); let TypecheckValue { expr, typ, .. } = db .typechecked_module(file.into(), expected_type.cloned()) + .await .map_err(|t| t.1)?; Ok((expr, typ)) } /// Compiles `expr` into a function which can be added and run by the `vm` - fn compile_script( + async fn compile_script( &self, filename: &str, expr_str: &str, @@ -489,71 +517,95 @@ pub trait ThreadExt { metadata_map: Default::default(), } .compile( - &mut self.module_compiler(&vm.get_database()), + &mut ModuleCompiler::new(&mut vm.get_database()), vm, filename, expr_str, (), ) + .await .map(|result| result.module) } /// Compiles the source code `expr_str` into bytecode serialized using `serializer` #[cfg(feature = "serialization")] - fn compile_to_bytecode( + async fn compile_to_bytecode( &self, name: &str, expr_str: &str, serializer: S, ) -> StdResult> where - S: serde::Serializer, + S: serde::Serializer + Send, S::Error: 'static, { let thread = self.thread(); compile_to( expr_str, - &mut self.module_compiler(&thread.get_database()), + &mut ModuleCompiler::new(&mut thread.get_database()), &thread, name, expr_str, None, serializer, ) + .await } /// Loads bytecode from a `Deserializer` and stores it into the module `name`. /// /// `load_script` is equivalent to `compile_to_bytecode` followed by `load_bytecode` #[cfg(feature = "serialization")] - fn load_bytecode<'vm, D>(&'vm self, name: &str, deserializer: D) -> BoxFuture<'vm, (), Error> + async fn load_bytecode<'vm, D, E>(&self, name: &str, deserializer: D) -> Result<()> where - D: serde::Deserializer<'vm> + 'vm, - D::Error: Send + Sync, + D: for<'de> serde::Deserializer<'de, Error = E> + Send, + E: Send + Sync, { let thread = self.thread(); - Box::new(Precompiled(deserializer).load_script( - &mut self.module_compiler(&thread.get_database()), - thread, - name, - "", - (), - )) + Precompiled(deserializer) + .load_script( + &mut ModuleCompiler::new(&mut thread.get_database()), + thread, + name, + "", + (), + ) + .await } /// Parses and typechecks `expr_str` followed by extracting metadata from the created /// expression - fn extract_metadata( + async fn extract_metadata( &self, file: &str, expr_str: &str, ) -> Result<(Arc>, ArcType, Arc)> { use crate::check::metadata; - let (expr, typ) = self.typecheck_str(file, expr_str, None)?; + let module_name = filename_to_module(file); let vm = self.thread(); - let (metadata, _) = metadata::metadata(&vm.get_env(), &expr); - Ok((expr, typ, metadata)) + { + let mut db = vm.get_database_mut(); + db.add_module(module_name.clone(), expr_str.into()); + } + + let mut db = vm.get_database(); + let TypecheckValue { + expr, + typ, + metadata, + .. + } = db + .typechecked_module(module_name, None) + .map_err(|(_, err)| err) + .await?; + + if db.compiler_settings().full_metadata { + Ok((expr, typ, metadata)) + } else { + let (metadata, _) = metadata::metadata(&vm.get_env(), &expr); + Ok((expr, typ, metadata)) + } } /// Compiles `input` and if it is successful runs the resulting code and stores the resulting @@ -562,10 +614,10 @@ pub trait ThreadExt { /// If at any point the function fails the resulting error is returned and nothing is added to /// the VM. fn load_script(&self, filename: &str, input: &str) -> Result<()> { - self.load_script_async(filename, input).wait() + futures::executor::block_on(self.load_script_async(filename, input)) } - fn load_script_async<'vm>(&self, filename: &str, input: &str) -> BoxFuture<'vm, (), Error> { + async fn load_script_async(&self, filename: &str, input: &str) -> Result<()> { let module_name = filename_to_module(filename); let vm = self.thread(); @@ -573,32 +625,30 @@ pub trait ThreadExt { let mut db = vm.get_database_mut(); db.add_module(module_name.clone(), input.into()); } - let db = vm.get_database(); - Box::new(future::result(db.global(module_name).map(|_| ()))) + let mut db = vm.get_database(); + db.global(module_name).await.map(|_| ()) } /// Loads `filename` and compiles and runs its input by calling `load_script` fn load_file<'vm>(&'vm self, filename: &str) -> Result<()> { - self.load_file_async(filename).wait() + futures::executor::block_on(self.load_file_async(filename)) } - fn load_file_async<'vm>(&self, filename: &str) -> BoxFuture<'static, (), Error> { + async fn load_file_async<'vm>(&self, filename: &str) -> Result<()> { let vm = self.thread(); // Use the import macro's path resolution if it exists so that we mimick the import // macro as close as possible let import = get_import(vm); let module_name = Symbol::from(format!("@{}", filename_to_module(filename))); - Box::new( - import - .load_module( - &mut self.module_compiler(&import.snapshot(vm.root_thread())), - vm, - &module_name, - ) - .map_err(|(_, err)| err.into()) - .map(|_| ()) - .into_future(), - ) + import + .load_module( + &mut ModuleCompiler::new(&mut import.snapshot(vm.root_thread())), + vm, + &module_name, + ) + .await + .map_err(|(_, err)| err.into()) + .map(|_| ()) } /// Compiles and runs the expression in `expr_str`. If successful the value from running the @@ -626,23 +676,7 @@ pub trait ThreadExt { where T: for<'value> Getable<'vm, 'value> + VmType + Send + 'vm, { - let vm = self.thread(); - let expected = T::make_type(vm); - expr_str - .run_expr( - &mut self.module_compiler(&vm.get_database()), - vm, - name, - expr_str, - Some(&expected), - ) - .and_then(move |execute_value| { - Ok(( - T::from_value(vm, execute_value.value.get_variant()), - execute_value.typ, - )) - }) - .wait() + futures::executor::block_on(self.run_expr_async(name, expr_str)) } /// Compiles and runs the expression in `expr_str`. If successful the value from running the @@ -667,36 +701,42 @@ pub trait ThreadExt { /// } /// ``` /// - fn run_expr_async( - &self, - name: &str, - expr_str: &str, - ) -> BoxFuture<'static, (T, ArcType), Error> + async fn run_expr_async<'vm, T>(&'vm self, name: &str, expr_str: &str) -> Result<(T, ArcType)> where - T: for<'vm, 'value> Getable<'vm, 'value> + VmType + Send + 'static, + T: for<'value> Getable<'vm, 'value> + VmType + Send + 'vm, { let vm = self.thread(); let expected = T::make_type(&vm); - let vm = vm.root_thread(); - Box::new( - expr_str - .run_expr( - &mut self.module_compiler(&vm.get_database()), - vm.clone(), - name, - expr_str, - Some(&expected), - ) - .and_then(move |execute_value| { + + expr_str + .run_expr( + &mut ModuleCompiler::new(&mut vm.get_database()), + vm, + name, + expr_str, + Some(&expected), + ) + .and_then(move |execute_value| { + async move { Ok(( - T::from_value(&vm, execute_value.value.get_variant()), + T::from_value(vm, execute_value.value.get_variant()), execute_value.typ, )) - }), - ) + } + }) + .await } fn format_expr(&self, formatter: &mut Formatter, file: &str, input: &str) -> Result { + futures::executor::block_on(self.format_expr_async(formatter, file, input)) + } + + async fn format_expr_async( + &self, + formatter: &mut Formatter, + file: &str, + input: &str, + ) -> Result { fn has_format_disabling_errors(file: &codespan::FileName, err: &Error) -> bool { match *err { Error::Multiple(ref errors) => errors @@ -708,11 +748,11 @@ pub trait ThreadExt { } let thread = self.thread(); - let db = thread.get_database(); - let mut compiler = self.module_compiler(&db); + let mut db = thread.get_database(); + let mut compiler = ModuleCompiler::new(&mut db); let compiler = &mut compiler; - let expr = match input.reparse_infix(compiler, thread, file, input) { + let expr = match input.reparse_infix(compiler, thread, file, input).await { Ok(expr) => expr.expr, Err((Some(expr), err)) => { if has_format_disabling_errors(&codespan::FileName::from(file.to_string()), &err) { @@ -831,6 +871,10 @@ impl VmBuilder { } pub fn build(self) -> RootedThread { + futures::executor::block_on(self.build_async()) + } + + pub async fn build_async(self) -> RootedThread { let vm = RootedThread::with_global_state(crate::vm::vm::GlobalVmStateBuilder::new().build()); @@ -852,9 +896,14 @@ impl VmBuilder { macros.insert(String::from("lift_io"), lift_io::LiftIo); } - add_extern_module(&vm, "std.prim", crate::vm::primitives::load); + add_extern_module_with_deps( + &vm, + "std.prim", + crate::vm::primitives::load, + vec!["std.types".into()], + ); - vm.run_expr::>( + vm.run_expr_async::>( "", r#"//@NO-IMPLICIT-PRELUDE let _ = import! std.types @@ -862,26 +911,43 @@ impl VmBuilder { () "#, ) + .await .unwrap_or_else(|err| panic!("{}", err)); - add_extern_module(&vm, "std.byte.prim", crate::vm::primitives::load_byte); - add_extern_module(&vm, "std.int.prim", crate::vm::primitives::load_int); - add_extern_module(&vm, "std.float.prim", crate::vm::primitives::load_float); - add_extern_module(&vm, "std.string.prim", crate::vm::primitives::load_string); - add_extern_module(&vm, "std.fs.prim", crate::vm::primitives::load_fs); - add_extern_module(&vm, "std.path.prim", crate::vm::primitives::load_path); - add_extern_module(&vm, "std.char.prim", crate::vm::primitives::load_char); - add_extern_module(&vm, "std.array.prim", crate::vm::primitives::load_array); - - add_extern_module(&vm, "std.lazy.prim", crate::vm::lazy::load); - add_extern_module(&vm, "std.reference.prim", crate::vm::reference::load); - - add_extern_module(&vm, "std.channel.prim", crate::vm::channel::load_channel); - add_extern_module(&vm, "std.thread.prim", crate::vm::channel::load_thread); - add_extern_module(&vm, "std.debug.prim", crate::vm::debug::load); - add_extern_module(&vm, "std.io.prim", crate::std_lib::io::load); - add_extern_module(&vm, "std.process.prim", crate::std_lib::process::load); - add_extern_module(&vm, "std.env.prim", crate::std_lib::env::load); + let deps: &[(_, fn(&Thread) -> _)] = &[ + ("std.byte.prim", crate::vm::primitives::load_byte), + ("std.int.prim", crate::vm::primitives::load_int), + ("std.float.prim", crate::vm::primitives::load_float), + ("std.string.prim", crate::vm::primitives::load_string), + ("std.fs.prim", crate::vm::primitives::load_fs), + ("std.char.prim", crate::vm::primitives::load_char), + ("std.char.prim", crate::vm::primitives::load_char), + ("std.thread.prim", crate::vm::channel::load_thread), + ("std.io.prim", crate::std_lib::io::load), + ]; + for (name, load_fn) in deps { + add_extern_module_with_deps(&vm, name, load_fn, vec!["std.types".into()]); + } + + add_extern_module_with_deps( + &vm, + "std.path.prim", + crate::vm::primitives::load_path, + vec!["std.path.types".into()], + ); + + let deps: &[(_, fn(&Thread) -> _)] = &[ + ("std.array.prim", crate::vm::primitives::load_array), + ("std.lazy.prim", crate::vm::lazy::load), + ("std.reference.prim", crate::vm::reference::load), + ("std.channel.prim", crate::vm::channel::load_channel), + ("std.debug.prim", crate::vm::debug::load), + ("std.process.prim", crate::std_lib::process::load), + ("std.env.prim", crate::std_lib::env::load), + ]; + for (name, load_fn) in deps { + add_extern_module(&vm, name, load_fn); + } add_extern_module( &vm, @@ -892,12 +958,14 @@ impl VmBuilder { add_extern_module_if!( #[cfg(feature = "serialization")], available_if = "gluon is compiled with the 'serialization' feature", + dependencies = ["std.json"], args(&vm, "std.json.prim", crate::vm::api::json::load) ); add_extern_module_if!( #[cfg(feature = "regex")], available_if = "gluon is compiled with the 'regex' feature", + dependencies = ["std.regex.types"], args(&vm, "std.regex.prim", crate::std_lib::regex::load) ); @@ -910,6 +978,7 @@ impl VmBuilder { add_extern_module_if!( #[cfg(feature = "web")], available_if = "gluon is compiled with the 'web' feature", + dependencies = ["std.http.types"], args(&vm, "std.http.prim", crate::std_lib::http::load) ); @@ -929,6 +998,25 @@ pub fn new_vm() -> RootedThread { VmBuilder::default().build() } +pub async fn new_vm_async() -> RootedThread { + VmBuilder::default().build_async().await +} + +#[doc(hidden)] +pub fn sendify(f: F) -> impl Future + Send +where + F: Future + Send, + F::Output: Send, +{ + f + // let (tx, rx) = tokio::sync::oneshot::channel(); + // tokio::local::spawn(async move { + // // Ignore the send failure as the receiver do not care about it anymore + // let _ = tx.send(f.await); + // }); + // rx.map(|r| r.unwrap()) +} + #[cfg(test)] mod tests { use super::*; diff --git a/src/lift_io.rs b/src/lift_io.rs index c601b7ac84..d131cf18a4 100644 --- a/src/lift_io.rs +++ b/src/lift_io.rs @@ -23,79 +23,89 @@ use { pub(crate) struct LiftIo; impl Macro for LiftIo { - fn expand(&self, env: &mut MacroExpander, mut args: Vec>) -> MacroFuture { + fn expand<'a>( + &self, + env: &mut MacroExpander<'a>, + mut args: Vec>, + ) -> MacroFuture<'a> { if args.len() != 2 { - return Box::new(future::err(macros::Error::message(format!( + return Box::pin(future::err(macros::Error::message(format!( "`lift_io!` expects 1 argument" )))); } - let mut module = args.pop().unwrap(); - let lift = args.pop().unwrap(); - let mut symbols = Symbols::new(); - env.run(&mut symbols, &mut module); - let typ = module.env_type_of(&EmptyEnv::default()); - match *typ { - Type::Record(_) => (), - _ => { - return Box::new(future::err(macros::Error::message(format!( - "The second argument to `lift_io!` must be a record. Found: `{}`", - typ - )))) - } - } + let mut env = env.fork(); - let span = module.span; + Box::pin(async move { + let mut module = args.pop().unwrap(); + let lift = args.pop().unwrap(); + let mut symbols = Symbols::new(); + env.run(&mut symbols, &mut module).await; + let typ = module.env_type_of(&EmptyEnv::default()); - let vm = env.vm; + match *typ { + Type::Record(_) => (), + _ => { + return Err(macros::Error::message(format!( + "The second argument to `lift_io!` must be a record. Found: `{}`", + typ + ))) + } + } - let out = pos::spanned( - span, - Expr::Record { - typ: typ.clone(), - types: Vec::new(), - exprs: typ - .row_iter() - .filter_map(|field| { - let mut arg_iter = field.typ.remove_forall_and_implicit_args().arg_iter(); - let args = arg_iter.by_ref().count(); + let span = module.span; + + let vm = env.vm; - let action = pos::spanned( - span, - Expr::Projection( - Box::new(module.clone()), - field.name.clone(), - field.typ.clone(), - ), - ); + let out = pos::spanned( + span, + Expr::Record { + typ: typ.clone(), + types: Vec::new(), + exprs: typ + .row_iter() + .filter_map(|field| { + let mut arg_iter = + field.typ.remove_forall_and_implicit_args().arg_iter(); + let args = arg_iter.by_ref().count(); - if check_signature( - &vm.get_env(), - &arg_iter.typ, - &IO::::make_forall_type(&vm), - ) { - let action = lift_action( - &mut symbols, - lift.clone(), - action, - args, - &field.typ, + let action = pos::spanned( span, + Expr::Projection( + Box::new(module.clone()), + field.name.clone(), + field.typ.clone(), + ), ); - Some(ExprField { - metadata: Default::default(), - name: pos::spanned(span, field.name.clone()), - value: Some(action), - }) - } else { - None - } - }) - .collect(), - base: Some(Box::new(module)), - }, - ); - Box::new(future::ok(out)) + + if check_signature( + &vm.get_env(), + &arg_iter.typ, + &IO::::make_forall_type(&vm), + ) { + let action = lift_action( + &mut symbols, + lift.clone(), + action, + args, + &field.typ, + span, + ); + Some(ExprField { + metadata: Default::default(), + name: pos::spanned(span, field.name.clone()), + value: Some(action), + }) + } else { + None + } + }) + .collect(), + base: Some(Box::new(module)), + }, + ); + Ok(out) + }) } } diff --git a/src/query.rs b/src/query.rs index 893de82943..1dd8b1df47 100644 --- a/src/query.rs +++ b/src/query.rs @@ -1,13 +1,11 @@ use std::{ borrow::Cow, + collections::hash_map, result::Result as StdResult, sync::{Arc, Mutex, MutexGuard}, }; -use { - futures::{future, Future}, - salsa::Database, -}; +use {futures::prelude::*, salsa::Database}; use { base::{ @@ -32,7 +30,7 @@ use { }, }; -use crate::{compiler_pipeline::*, Error, Result, Settings, ThreadExt}; +use crate::{compiler_pipeline::*, Error, ModuleCompiler, Result, Settings}; pub use {crate::import::DatabaseSnapshot, salsa}; @@ -76,7 +74,7 @@ pub type DatabaseGlobal = vm::vm::Global>; #[derive(Default)] pub(crate) struct State { pub(crate) code_map: codespan::CodeMap, - pub(crate) inline_modules: FnvMap, + pub(crate) inline_modules: FnvMap>>, pub(crate) index_map: FnvMap, } @@ -145,8 +143,30 @@ pub struct CompilerDatabase { pub(crate) thread: Option, } +impl CompilerDatabase { + pub fn snapshot(&self, thread: RootedThread) -> salsa::Snapshot { + salsa::Snapshot::new(Self { + runtime: self.runtime.snapshot(self), + state: self.state.clone(), + thread: Some(thread), + }) + } + + pub fn fork( + &self, + state: Arc>, + thread: RootedThread, + ) -> salsa::Fork { + salsa::Fork::new(Self { + runtime: self.runtime.fork(self, state), + state: self.state.clone(), + thread: Some(thread), + }) + } +} + impl crate::query::CompilationBase for CompilerDatabase { - fn compiler(&self) -> &Self { + fn compiler(&mut self) -> &mut Self { self } @@ -159,14 +179,45 @@ impl crate::query::CompilationBase for CompilerDatabase { fn add_module(&mut self, module: String, contents: &str) { let state = self.state.clone(); let mut state = state.lock().unwrap(); - state.add_filemap(&module, &contents[..]); - if state - .inline_modules - .insert(module.clone(), contents.into()) - .is_some() - { - self.query_mut(ModuleTextQuery).invalidate(&module); + + match state.inline_modules.entry(module.clone()) { + hash_map::Entry::Occupied(entry) => { + let entry = entry.into_mut(); + if &**entry != contents { + let entry_contents = Arc::make_mut(entry).to_mut(); + entry_contents.clear(); + entry_contents.push_str(contents); + self.query_mut(ModuleTextQuery).invalidate(&module); + } else { + return; + } + } + hash_map::Entry::Vacant(entry) => { + entry.insert(Arc::new(Cow::Owned(contents.into()))); + } } + state.add_filemap(&module, &contents[..]); + } + + fn peek_typechecked_module( + &self, + key: &str, + ) -> Option>>> { + self.query(TypecheckedModuleQuery) + .peek(&(key.into(), None)) + .and_then(|r| r.ok()) + } + fn peek_core_expr(&self, key: &str) -> Option> { + self.query(CoreExprQuery) + .peek(&(key.into(), None)) + .and_then(|r| r.ok()) + } + + fn peek_global(&self, key: &str) -> Option { + self.query(GlobalInnerQuery) + .peek(&key.into()) + .and_then(|r| r.ok()) + .map(|global| unsafe { root_global_with(global, self.thread().root_thread()) }) } } @@ -174,15 +225,19 @@ impl salsa::Database for CompilerDatabase { fn salsa_runtime(&self) -> &salsa::Runtime { &self.runtime } + + fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime { + &mut self.runtime + } } impl salsa::ParallelDatabase for CompilerDatabase { fn snapshot(&self) -> salsa::Snapshot { - salsa::Snapshot::new(Self { - runtime: self.runtime.snapshot(self), - state: self.state.clone(), - thread: self.thread.clone(), - }) + panic!("Call CompilerDatabase::snapshot(&self, &Thread)") + } + + fn fork(&self, _state: Arc>) -> salsa::Fork { + panic!("Call CompilerDatabase::fork(&self, &Thread)") } } @@ -231,7 +286,7 @@ impl CompilerDatabase { self.state().add_filemap(file, source) } - pub(crate) fn collect_garbage(&self) { + pub(crate) fn collect_garbage(&mut self) { let strategy = salsa::SweepStrategy::default() .discard_values() .sweep_all_revisions(); @@ -244,22 +299,29 @@ impl CompilerDatabase { } pub trait CompilationBase: salsa::Database { - fn compiler(&self) -> &CompilerDatabase; + fn compiler(&mut self) -> &mut CompilerDatabase; fn thread(&self) -> &Thread; fn add_module(&mut self, module: String, contents: &str); + + fn peek_typechecked_module( + &self, + key: &str, + ) -> Option>>>; + fn peek_core_expr(&self, key: &str) -> Option>; + fn peek_global(&self, key: &str) -> Option; } #[salsa::query_group(CompileStorage)] pub trait Compilation: CompilationBase { #[salsa::input] - fn compiler_settings(&self) -> Settings; + fn compiler_settings(&mut self) -> Settings; #[salsa::dependencies] - fn module_text(&self, module: String) -> StdResult>, Error>; + fn module_text(&mut self, module: String) -> StdResult>, Error>; #[salsa::cycle(recover_cycle_typecheck)] - fn typechecked_module( - &self, + async fn typechecked_module( + &mut self, module: String, expected_type: Option, ) -> StdResult< @@ -267,38 +329,53 @@ pub trait Compilation: CompilationBase { (Option>>>, Error), >; - #[salsa::cycle(recover_cycle)] - fn core_expr(&self, module: String) -> StdResult, Error>; + #[salsa::cycle(recover_cycle_expected_type)] + async fn core_expr( + &mut self, + module: String, + expected_type: Option, + ) -> StdResult, Error>; - #[salsa::cycle(recover_cycle)] + #[salsa::cycle(recover_cycle_expected_type)] #[salsa::dependencies] - fn compiled_module( - &self, + async fn compiled_module( + &mut self, module: String, + expected_type: Option, ) -> StdResult>, Error>; #[salsa::cycle(recover_cycle)] - fn import(&self, module: String) -> StdResult, Error>; + async fn import(&mut self, module: String) -> StdResult, Error>; #[doc(hidden)] #[salsa::cycle(recover_cycle)] - fn global_(&self, name: String) -> Result; + async fn global_inner(&mut self, name: String) -> Result; #[salsa::transparent] #[salsa::cycle(recover_cycle)] - fn global(&self, name: String) -> Result; + async fn global(&mut self, name: String) -> Result; } fn recover_cycle_typecheck( - db: &impl Compilation, + db: &mut impl Compilation, cycle: &[String], module: &String, _: &Option, ) -> StdResult, Error)> { recover_cycle(db, cycle, module).map_err(|err| (None, err)) } + +fn recover_cycle_expected_type( + db: &mut impl Compilation, + cycle: &[String], + module: &String, + _: &Option, +) -> StdResult { + recover_cycle(db, cycle, module) +} + fn recover_cycle( - _db: &impl Compilation, + _db: &mut impl Compilation, cycle: &[String], module: &String, ) -> StdResult { @@ -318,19 +395,24 @@ fn recover_cycle( .into()) } -fn module_text(db: &impl Compilation, module: String) -> StdResult>, Error> { - db.salsa_runtime() +fn module_text( + db: &mut impl Compilation, + module: String, +) -> StdResult>, Error> { + db.salsa_runtime_mut() .report_synthetic_read(salsa::Durability::LOW); - let contents = if let Some(contents) = db.compiler().state().inline_modules.get(&module) { - Arc::new(contents.to_string().into()) // FIXME Avoid copying + let opt = { db.compiler().state().inline_modules.get(&module).cloned() }; + let contents = if let Some(contents) = opt { + contents } else { let mut filename = module.replace(".", "/"); filename.push_str(".glu"); + let use_standard_lib = db.compiler_settings().use_standard_lib; Arc::new( crate::get_import(db.thread()) - .get_module_source(db.compiler_settings().use_standard_lib, &module, &filename) + .get_module_source(use_standard_lib, &module, &filename) .map_err(macros::Error::new)?, ) }; @@ -338,46 +420,49 @@ fn module_text(db: &impl Compilation, module: String) -> StdResult, ) -> StdResult< TypecheckValue>>, (Option>>>, Error), > { - db.salsa_runtime().report_untracked_read(); + db.salsa_runtime_mut().report_untracked_read(); let text = db.module_text(module.clone()).map_err(|err| (None, err))?; - let thread = db.thread(); - let mut compiler = thread.module_compiler(db.compiler()); + let thread = db.thread().root_thread(); + let mut compiler = ModuleCompiler::new(db.compiler()); let value = text .typecheck_expected( &mut compiler, - thread, + &thread, &module, &text, expected_type.as_ref(), ) - .map_err(|(opt, err)| (opt.map(|value| value.map(Arc::new)), err))?; + .map_err(|(opt, err)| (opt.map(|value| value.map(Arc::new)), err)) + .await?; Ok(value.map(Arc::new)) } -fn core_expr( - db: &impl Compilation, +async fn core_expr( + db: &mut impl Compilation, module: String, + expected_type: Option, ) -> StdResult, Error> { - db.salsa_runtime().report_untracked_read(); + db.salsa_runtime_mut().report_untracked_read(); let value = db - .typechecked_module(module.clone(), None) - .map_err(|(_, err)| err)?; + .typechecked_module(module.clone(), expected_type) + .map_err(|(_, err)| err) + .await?; let settings = db.compiler_settings(); let env = db.compiler(); - Ok(core::with_translator(&env, |translator| { + Ok(core::with_translator(&*env, |translator| { let expr = translator.translate_expr(&value.expr); debug!("Translation returned: {}", expr); @@ -396,17 +481,15 @@ fn core_expr( })) } -fn compiled_module( - db: &impl Compilation, +async fn compiled_module( + db: &mut impl Compilation, module: String, + expected_type: Option, ) -> StdResult>, Error> { - let core_expr = db.core_expr(module.clone())?; + let core_expr = db.core_expr(module.clone(), expected_type).await?; let settings = db.compiler_settings(); - let thread = db.thread(); - let env = db.compiler(); - - let mut compiler = thread.module_compiler(db.compiler()); + let mut compiler = ModuleCompiler::new(db.compiler()); let source = compiler .get_filemap(&module) @@ -418,9 +501,10 @@ fn compiled_module( &mut compiler.symbols, ); + let env = db.compiler(); let mut compiler = vm::compiler::Compiler::new( - &env, - thread.global_env(), + &*env, + env.thread().global_env(), symbols, &source, module.clone(), @@ -430,24 +514,26 @@ fn compiled_module( let mut compiled_module = compiler.compile_expr(core_expr.value.expr())?; let module_id = Symbol::from(format!("@{}", name)); compiled_module.function.id = module_id.clone(); - let closure = thread + let closure = env + .thread() .global_env() - .new_global_thunk(&thread, compiled_module)?; + .new_global_thunk(&env.thread(), compiled_module)?; Ok(closure) } -fn import(db: &impl Compilation, modulename: String) -> StdResult, Error> { +async fn import(db: &mut impl Compilation, modulename: String) -> StdResult, Error> { + let thread = db.thread().root_thread(); let compiler = db.compiler(); - let thread = db.thread(); let name = Symbol::from(if modulename.starts_with('@') { modulename.clone() } else { format!("@{}", modulename) }); - let result = crate::get_import(thread) - .load_module(&mut thread.module_compiler(compiler), thread, &name) + let result = crate::get_import(&thread) + .load_module(&mut ModuleCompiler::new(compiler), &thread, &name) + .await .map_err(|(_, err)| err); compiler.collect_garbage(); @@ -457,26 +543,19 @@ fn import(db: &impl Compilation, modulename: String) -> StdResult, Ok(Expr::Ident(TypedIdent { name, typ })) } -fn global_(db: &impl Compilation, name: String) -> Result { - let vm = db.thread(); - +async fn global_inner(db: &mut impl Compilation, name: String) -> Result { let TypecheckValue { metadata, typ, .. } = db .typechecked_module(name.clone(), None) - .map_err(|(_, err)| err)?; - let closure = db.compiled_module(name.clone())?; + .map_err(|(_, err)| err) + .await?; + let closure = db.compiled_module(name.clone(), None).await?; let module_id = closure.function.name.clone(); - let vm1 = vm.clone(); - let ExecuteValue { - id, - metadata, - typ, - value, - .. - } = vm1 + let vm = db.thread(); + let v = vm .call_thunk_top(&closure) - .map(move |value| ExecuteValue { + .map_ok(move |value| ExecuteValue { id: module_id, expr: (), typ, @@ -484,15 +563,22 @@ fn global_(db: &impl Compilation, name: String) -> Result { metadata, }) .map_err(Error::from) - .and_then(move |v| { - if db.compiler_settings().run_io { - future::Either::B(crate::compiler_pipeline::run_io(vm, v)) - } else { - future::Either::A(future::ok(v)) - } - }) - .wait()?; + .await?; + let ExecuteValue { + id, + metadata, + typ, + value, + .. + } = if db.compiler_settings().run_io { + let vm = db.thread(); + crate::compiler_pipeline::run_io(vm, v).await? + } else { + v + }; + + let vm = db.thread(); let mut gc = vm.global_env().gc.lock().unwrap(); let mut cloner = vm::internal::Cloner::new(vm, &mut gc); let value = cloner.deep_clone(&value)?; @@ -507,8 +593,9 @@ fn global_(db: &impl Compilation, name: String) -> Result { }) } -fn global(db: &impl Compilation, name: String) -> Result { - db.global_(name) +async fn global(db: &mut impl Compilation, name: String) -> Result { + db.global_inner(name) + .await .map(|global| unsafe { root_global_with(global, db.thread().root_thread()) }) } @@ -577,8 +664,7 @@ impl PrimitiveEnv for CompilerDatabase { impl MetadataEnv for CompilerDatabase { fn get_metadata(&self, id: &SymbolRef) -> Option> { if id.is_global() { - self.typechecked_module(id.definition_name().into(), None) - .ok() + self.peek_typechecked_module(id.definition_name()) .map(|v| v.metadata.clone()) } else { None @@ -589,7 +675,7 @@ impl MetadataEnv for CompilerDatabase { impl OptimizeEnv for CompilerDatabase { fn find_expr(&self, id: &Symbol) -> Option> { if id.is_global() { - self.core_expr(id.definition_name().into()).ok() + self.peek_core_expr(id.definition_name().into()) } else { None } @@ -614,7 +700,7 @@ impl VmEnv for CompilerDatabase { metadata: global.metadata.clone(), value: self.thread().root_value(global.value.get_variants()), }) - .or_else(|| self.global(module.as_str().into()).ok()) + .or_else(|| self.peek_global(module.as_str().into())) } } @@ -709,7 +795,7 @@ impl CompilerDatabase { metadata: global.metadata.clone(), value: self.thread().root_value(global.value.get_variants()), }) - .or_else(|| self.global(module.as_str().into()).ok()) + .or_else(|| self.peek_global(module.as_str().into())) { break g; } diff --git a/src/std_lib/http.rs b/src/std_lib/http.rs index adec646ee8..37153c744b 100644 --- a/src/std_lib/http.rs +++ b/src/std_lib/http.rs @@ -1,20 +1,23 @@ use crate::real_std::{ fmt, fs, - path::Path, + path::PathBuf, + pin::Pin, sync::{Arc, Mutex}, }; use { collect_mac::collect, - futures::{ - future::{self, Either}, - Async, Future, Stream, + futures_preview::{ + future::{self, BoxFuture}, + prelude::*, + ready, task, Future, Poll, Stream, }, http::{ header::{HeaderMap, HeaderName, HeaderValue}, StatusCode, }, - hyper::{service::Service, Chunk, Server}, + hyper::{Chunk, Server}, + pin_project::pin_project, }; use crate::base::types::{ArcType, Type}; @@ -31,7 +34,7 @@ use crate::vm::{ macro_rules! try_future { ($e:expr) => { - try_future!($e, Box::new) + try_future!($e, Box::pin) }; ($e:expr, $f:expr) => { match $e { @@ -104,7 +107,7 @@ impl<'vm, 'value> Getable<'vm, 'value> for Headers { #[gluon_trace(skip)] // Representation of a http body that is in the prograss of being read pub struct Body( - Arc, Error = vm::Error> + Send>>>, + Arc, vm::Error>> + Send>>>>, ); // Types implementing `Userdata` requires a `std::fmt::Debug` implementation so it can be displayed @@ -116,15 +119,22 @@ impl fmt::Debug for Body { // Since `Body` implements `Userdata` gluon will automatically marshal the gluon representation // into `&Body` argument -fn read_chunk( - body: &Body, -) -> impl Future>>, Error = vm::Error> { +fn read_chunk(body: &Body) -> impl Future>>> { use futures::future::poll_fn; let body = body.0.clone(); - poll_fn(move || { + poll_fn(move |cx| { let mut stream = body.lock().unwrap(); - stream.poll().map(|r#async| r#async.map(IO::Value)) + Poll::Ready(IO::Value( + if let Some(result) = ready!(stream.as_mut().poll_next(cx)) { + match result { + Ok(chunk) => Some(chunk), + Err(err) => return IO::Exception(err.to_string()).into(), + } + } else { + None + }, + )) }) } @@ -141,16 +151,13 @@ impl fmt::Debug for ResponseBody { } } -fn write_response( - response: &ResponseBody, - bytes: &[u8], -) -> impl Future, Error = vm::Error> { +fn write_response(response: &ResponseBody, bytes: &[u8]) -> impl Future> { use futures::future::poll_fn; // Turn `bytes´ into a `Chunk` which can be sent to the http body let mut unsent_chunk = Some(bytes.to_owned().into()); let response = response.0.clone(); - poll_fn(move || { + poll_fn(move |cx| { info!("Starting response send"); let mut sender = response.lock().unwrap(); let sender = sender @@ -159,22 +166,22 @@ fn write_response( let chunk = unsent_chunk .take() .expect("Attempt to poll after chunk is sent"); - match sender.poll_ready() { - Ok(Async::NotReady) => { + match sender.poll_ready(cx) { + Poll::Pending => { unsent_chunk = Some(chunk); - return Ok(Async::NotReady); + return Poll::Pending; } - Ok(Async::Ready(_)) => (), - Err(err) => { + Poll::Ready(Ok(_)) => (), + Poll::Ready(Err(err)) => { info!("Could not send http response {}", err); - return Ok(IO::Exception(err.to_string()).into()); + return IO::Exception(err.to_string()).into(); } } - match sender.send_data(chunk) { - Ok(()) => Ok(Async::Ready(IO::Value(()))), + match sender.try_send_data(chunk) { + Ok(()) => Poll::Ready(IO::Value(())), Err(chunk) => { unsent_chunk = Some(chunk); - Ok(IO::Exception("Could not send http response".into()).into()) + IO::Exception("Could not send http response".into()).into() } } }) @@ -208,23 +215,27 @@ type HttpState = record_type! { #[derive(Getable, VmType)] #[gluon(crate_name = "::vm")] -struct Settings<'a> { +struct Settings { port: u16, - tls_cert: Option<&'a Path>, + tls_cert: Option, } fn listen( settings: Settings, - value: WithVM>>, -) -> impl Future, Error = vm::Error> + Send + 'static { - let WithVM { - value: handler, - vm: thread, - } = value; + WithVM { vm, value }: WithVM>>, +) -> impl Future> + Send + 'static { + let vm = vm.root_thread(); + listen_(settings, vm, value).map(IO::from) +} +async fn listen_( + settings: Settings, + thread: RootedThread, + handler: OpaqueValue>, +) -> vm::Result<()> { let thread = match thread.new_thread() { Ok(thread) => thread, - Err(err) => return Either::A(future::err(err)), + Err(err) => return Err(err), }; // Retrieve the `handle` function from the http module which we use to evaluate values of type @@ -239,25 +250,28 @@ fn listen( handler: OpaqueValue>, } - impl Service for Listen { - type ReqBody = hyper::Body; - type ResBody = hyper::Body; + impl tower_service::Service> for Listen { + type Response = hyper::Response; type Error = vm::Error; - type Future = Box< - dyn Future, Error = Self::Error> + Send + 'static, - >; + type Future = BoxFuture<'static, Result, vm::Error>>; + + fn poll_ready(&mut self, _cx: &mut task::Context<'_>) -> Poll> { + Ok(()).into() + } - fn call(&mut self, request: http::Request) -> Self::Future { + fn call(&mut self, request: hyper::Request) -> Self::Future { let (parts, body) = request.into_parts(); let gluon_request = record_no_decl! { method => parts.method.as_str().to_owned(), uri => Uri(parts.uri), // Since `Body` implements `Userdata` it can be directly pushed to gluon - body => Body(Arc::new(Mutex::new(Box::new(body - .map_err(|err| vm::Error::Message(format!("{}", err))) - // `PushAsRef` makes the `body` parameter act as a `&[u8]` which means it is - // marshalled to `Array Byte` in gluon - .map(PushAsRef::<_, [u8]>::new))))) + body => Body(Arc::new(Mutex::new(Box::pin( + body + .map_err(|err| vm::Error::Message(format!("{}", err))) + // `PushAsRef` makes the `body` parameter act as a `&[u8]` which means it is + // marshalled to `Array Byte` in gluon + .map_ok(PushAsRef::<_, [u8]>::new) + )))) }; let (response_sender, response_body) = hyper::Body::channel(); let response_sender = Arc::new(Mutex::new(Some(response_sender))); @@ -269,9 +283,11 @@ fn listen( let child_thread = try_future!(self.handle.vm().new_thread()); let mut handle = try_future!(self.handle.re_root(child_thread)); - Box::new( - handle.call_async(self.handler.clone(), http_state).then( - move |result| match result { + let handler = self.handler.clone(); + Box::pin(async move { + handle + .call_async(handler, http_state) + .map(move |result| match result { Ok(value) => { match value { IO::Value(record_p! { status, headers }) => { @@ -304,79 +320,79 @@ fn listen( .body("".into()) .unwrap()) } - }, - ), - ) + }) + .await + }) } } let addr = format!("0.0.0.0:{}", settings.port).parse().unwrap(); - if let Some(cert_path) = settings.tls_cert { - let identity = try_future!( - fs::read(cert_path).map_err(|err| vm::Error::Message(format!( + if let Some(cert_path) = &settings.tls_cert { + let identity = fs::read(cert_path).map_err(|err| { + vm::Error::Message(format!( "Unable to open certificate `{}`: {}", cert_path.display(), err - ))), - Either::A - ); + )) + })?; - let identity = try_future!( - native_tls::Identity::from_pkcs12(&identity, "") - .map_err(|err| vm::Error::Message(err.to_string())), - Either::A - ); - let acceptor = tokio_tls::TlsAcceptor::from(try_future!( + let identity = native_tls::Identity::from_pkcs12(&identity, "") + .map_err(|err| vm::Error::Message(err.to_string()))?; + let acceptor = tokio_tls::TlsAcceptor::from( native_tls::TlsAcceptor::new(identity) - .map_err(|err| vm::Error::Message(err.to_string())), - Either::A - )); + .map_err(|err| vm::Error::Message(err.to_string()))?, + ); let http = hyper::server::conn::Http::new(); - let listener = try_future!( - tokio_tcp::TcpListener::bind(&addr).map_err(|err| vm::Error::Message(err.to_string())), - Either::A - ); - let incoming = listener - .incoming() - .map(move |stream| { - acceptor.accept(stream).map(Some).or_else(|err| { - info!("Unable to accept TLS connection: {}", err); - Ok(None) - }) - }) - .buffer_unordered(100) - .filter_map(|opt_tls_stream| opt_tls_stream); - let future = http - .serve_incoming(incoming, move || -> Result<_, hyper::Error> { - Ok(Listen { - handle: handle.clone(), - handler: handler.clone(), - }) + let listener = tokio_net::tcp::TcpListener::bind(&addr) + .map_err(|err| vm::Error::Message(err.to_string())) + .await?; + let incoming = listener.incoming().err_into().and_then(|stream| { + acceptor.accept(stream).map_err(|err| { + info!("Unable to accept TLS connection: {}", err); + Box::new(err) as Box }) - .and_then(|connecting| connecting) - .for_each(|connection| { - hyper::rt::spawn(connection.map_err(|err| info!("{}", err))); - Ok(()) - }) - .map(|_| IO::Value(())) - .map_err(|err| vm::Error::from(format!("Server error: {}", err))); - return Either::B(Either::A(future)); - } + }); + + #[pin_project] + struct Acceptor(#[pin] S); + impl hyper::server::accept::Accept for Acceptor + where + S: Stream>, + { + type Conn = T; + type Error = E; + fn poll_accept( + self: Pin<&mut Self>, + cx: &mut task::Context<'_>, + ) -> Poll>> { + self.project().0.poll_next(cx) + } + } - Either::B(Either::B( - Server::bind(&addr) - .serve(move || -> Result<_, hyper::Error> { - Ok(Listen { + return hyper::server::Builder::new(Acceptor(incoming), http) + .serve(hyper::service::make_service_fn(move |_| { + future::ready(Ok::<_, hyper::Error>(Listen { handle: handle.clone(), handler: handler.clone(), - }) - }) + })) + })) .map_err(|err| vm::Error::from(format!("Server error: {}", err))) - .map(|_| IO::Value(())), - )) + .await; + } + + Server::bind(&addr) + .serve(hyper::service::make_service_fn(move |_| { + future::ready(Ok::<_, hyper::Error>(Listen { + handle: handle.clone(), + handler: handler.clone(), + })) + })) + .map_err(|err| vm::Error::from(format!("Server error: {}", err))) + .map_ok(|_| ()) + .await } // To let the `http_types` module refer to `Body` and `ResponseBody` we register these types in a diff --git a/src/std_lib/io.rs b/src/std_lib/io.rs index 038a4f985a..d6992dcaed 100644 --- a/src/std_lib/io.rs +++ b/src/std_lib/io.rs @@ -5,10 +5,9 @@ use crate::real_std::{ sync::Mutex, }; -use futures::{ - future::{self, Either}, - Future, -}; +use futures::prelude::*; + +use futures::Future; use crate::vm::{ self, @@ -23,7 +22,7 @@ use crate::vm::{ ExternModule, Result, }; -use crate::{compiler_pipeline::*, Error, ThreadExt}; +use crate::{compiler_pipeline::*, Error, ModuleCompiler, ThreadExt}; fn print(s: &str) -> IO<()> { print!("{}", s); @@ -235,37 +234,39 @@ fn read_line() -> IO { fn catch<'vm>( action: OpaqueValue<&'vm Thread, IO>, mut catch: OwnedFunction IO>>, -) -> impl Future>, Error = vm::Error> { +) -> impl Future>> + Send { let vm = action.vm().root_thread(); let frame_level = vm.context().frame_level(); let mut action: OwnedFunction OpaqueValue> = Getable::from_value(&vm, action.get_variant()); - action.call_fast_async(()).then(move |result| match result { - Ok(value) => Either::A(future::ok(IO::Value(value))), - Err(err) => { - { - let mut context = vm.context(); + async move { + match action.call_async(()).await { + Ok(value) => IO::Value(value), + Err(err) => { { - let stack = context.stack_frame::(); + let mut context = vm.context(); + { + let stack = context.stack_frame::(); - if let Err(err) = crate::vm::thread::reset_stack(stack, frame_level) { - return Either::A(future::ok(IO::Exception(err.to_string().into()))); + if let Err(err) = crate::vm::thread::reset_stack(stack, frame_level) { + return IO::Exception(err.to_string().into()); + } } + + let mut stack = context.stack_frame::(); + let len = stack.len(); + stack.pop_many(len - 3); } - let mut stack = context.stack_frame::(); - let len = stack.len(); - stack.pop_many(len - 2); - } - Either::B(catch.call_fast_async(format!("{}", err)).then(|result| { - Ok(match result { + let err = format!("{}", err); + match catch.call_async(err).await { Ok(value) => value, Err(err) => IO::Exception(format!("{}", err)), - }) - })) + } + } } - }) + } } fn throw(msg: String) -> IO> { @@ -291,51 +292,55 @@ field_decl! { value, typ } #[allow(dead_code)] type RunExpr = record_type! { value => String, typ => String }; -fn run_expr( - WithVM { vm, value: expr }: WithVM<&str>, -) -> impl Future, Error = vm::Error> { +fn run_expr(WithVM { vm, value: expr }: WithVM<&str>) -> impl Future> { let vm = vm.root_thread(); - let vm1 = vm.clone(); - let db = vm.get_database(); - expr.run_expr(&mut vm.module_compiler(&db), vm1, "", expr, None) - .then(move |run_result| { - let mut context = vm.context(); - let stack = context.stack_frame::(); - Ok(match run_result { - Ok(execute_value) => { - let env = vm.get_env(); - let typ = execute_value.typ; - let debug_level = vm.global_env().get_debug_level(); - IO::Value(record_no_decl!{ - value => ValuePrinter::new(&env, &typ, execute_value.value.get_variant(), &debug_level).width(80).to_string(), - typ => typ.to_string() - }) + let expr = expr.to_owned(); // FIXME + crate::sendify(async move { + let mut db = vm.get_database(); + expr.run_expr(&mut ModuleCompiler::new(&mut db), vm1, "", &expr, None) + .map(|run_result| { + let mut context = vm.context(); + let stack = context.stack_frame::(); + match run_result { + Ok(execute_value) => { + let env = vm.get_env(); + let typ = execute_value.typ; + let debug_level = vm.global_env().get_debug_level(); + IO::Value(record_no_decl!{ + value => ValuePrinter::new(&env, &typ, execute_value.value.get_variant(), &debug_level).width(80).to_string(), + typ => typ.to_string() + }) + } + Err(err) => clear_frames(err, stack), } - Err(err) => clear_frames(err, stack), - }) - }) + }).await + }) } fn load_script( WithVM { vm, value: name }: WithVM<&str>, expr: &str, -) -> impl Future, Error = vm::Error> { +) -> impl Future> { let vm1 = vm.root_thread(); let vm = vm.root_thread(); let name = name.to_string(); + let expr = expr.to_owned(); // FIXME - let db = vm.get_database(); - expr.load_script(&mut vm.module_compiler(&db), vm1, &name, expr, None) - .then(move |run_result| { - let mut context = vm.context(); - let stack = context.stack_frame::(); - let io = match run_result { - Ok(()) => IO::Value(format!("Loaded {}", name)), - Err(err) => clear_frames(err, stack), - }; - Ok(io) - }) + crate::sendify(async move { + let mut db = vm.get_database(); + expr.load_script(&mut ModuleCompiler::new(&mut db), vm1, &name, &expr, None) + .map(|run_result| { + let mut context = vm.context(); + let stack = context.stack_frame::(); + let io = match run_result { + Ok(()) => IO::Value(format!("Loaded {}", name)), + Err(err) => clear_frames(err, stack), + }; + io + }) + .await + }) } mod std { diff --git a/tests/api.rs b/tests/api.rs index 0514871469..86823dde58 100644 --- a/tests/api.rs +++ b/tests/api.rs @@ -1,9 +1,6 @@ -extern crate env_logger; -extern crate futures; #[macro_use] extern crate serde_derive; -extern crate gluon; #[macro_use] extern crate gluon_vm; #[macro_use] @@ -11,7 +8,7 @@ extern crate gluon_codegen; use std::sync::Arc; -use futures::{future::lazy, Future, IntoFuture}; +use futures::prelude::*; use gluon::{ base::types::{Alias, ArcType, Type}, @@ -153,8 +150,8 @@ fn array() { fn return_finished_future() { let _ = ::env_logger::try_init(); - fn add(x: i32, y: i32) -> FutureResult> { - FutureResult(Ok(x + y).into_future()) + fn add(x: i32, y: i32) -> FutureResult> { + FutureResult(async move { x + y }) } let expr = r#" @@ -175,27 +172,24 @@ fn return_finished_future() { assert_eq!(result, expected); } -fn poll_n(s: String) -> FutureResult, Error = Error>> { - use futures::sync::oneshot::channel; +fn poll_n(s: String) -> FutureResult>> { + use futures::channel::oneshot::channel; use std::thread::spawn; let (ping_c, ping_p) = channel(); let (pong_c, pong_p) = channel(); spawn(move || { - ping_p.wait().expect("wait"); + futures::executor::block_on(ping_p).expect("wait"); pong_c.send(s).expect("send"); }); - FutureResult( - lazy(move || { - ping_c.send(()).unwrap(); - Ok(()) - }) - .and_then(|_| { + FutureResult(async move { + ping_c.send(()).unwrap(); + IO::from( pong_p - .map(IO::Value) - .map_err(|err| Error::Message(format!("{}", err))) - }), - ) + .await + .map_err(|err| Error::Message(format!("{}", err))), + ) + }) } #[test] @@ -251,8 +245,8 @@ fn io_future() { let _ = ::env_logger::try_init(); - fn test(_: ()) -> FutureResult, Error = Error>> { - FutureResult(Ok(IO::Value(123)).into_future()) + fn test(_: ()) -> FutureResult>> { + FutureResult(async { IO::Value(123) }) } let expr = r#" diff --git a/tests/debug.rs b/tests/debug.rs index fcd29597ab..03d9bed9ef 100644 --- a/tests/debug.rs +++ b/tests/debug.rs @@ -1,15 +1,12 @@ #[macro_use] extern crate collect_mac; -extern crate env_logger; -extern crate futures; -extern crate gluon; use std::{ collections::BTreeMap, sync::{Arc, Mutex}, }; -use futures::{Async, Future}; +use futures::{prelude::*, task::Poll}; use gluon::{ base::{ @@ -55,7 +52,7 @@ fn function_hook() { .expect("function_name") .to_string(), ); - Ok(Async::Ready(())) + Poll::Ready(Ok(())) }))); context.set_hook_mask(HookFlags::CALL_FLAG); } @@ -74,34 +71,29 @@ fn run_line_hook_test(source: &str) -> Vec { let thread = new_vm(); { let mut context = thread.context(); - context.set_hook(Some(Box::new(move |_, _| Ok(Async::NotReady)))); + context.set_hook(Some(Box::new(move |_, _| Poll::Pending))); context.set_hook_mask(HookFlags::LINE_FLAG); } thread.get_database_mut().implicit_prelude(false); - let mut execute = thread.run_expr_async::("test", source).map(|_| ()); - let mut result = Ok(Async::NotReady); + let execute = thread.run_expr_async::("test", source).map_ok(|_| ()); + futures::pin_mut!(execute); + let mut result = Poll::Pending; let mut lines = Vec::new(); - loop { - match result { - Ok(Async::Ready(())) => break, - Ok(Async::NotReady) => { + futures::executor::block_on(future::lazy(|cx| loop { + match &result { + Poll::Ready(Ok(())) => break, + Poll::Pending => { let context = thread.context(); let debug_info = context.debug_info(); - lines.push( - debug_info - .stack_info(0) - .expect("stack info") - .line() - .expect("expected line"), - ); + lines.extend(debug_info.stack_info(0).expect("stack info").line()); } - Err(err) => panic!("{}", err), + Poll::Ready(Err(err)) => panic!("{}", err), } - result = execute.poll(); - } + result = execute.poll_unpin(cx); + })); lines } @@ -147,7 +139,7 @@ fn line_hook_after_call() { let thread = new_vm(); { let mut context = thread.context(); - context.set_hook(Some(Box::new(move |_, _| Ok(Async::NotReady)))); + context.set_hook(Some(Box::new(move |_, _| Poll::Pending))); context.set_hook_mask(HookFlags::LINE_FLAG); } @@ -159,22 +151,23 @@ fn line_hook_after_call() { thread.get_database_mut().implicit_prelude(false); - let mut execute = thread.run_expr_async::("test", expr).map(|_| ()); - let mut result = Ok(Async::NotReady); + let execute = thread.run_expr_async::("test", expr).map_ok(|_| ()); + futures::pin_mut!(execute); + let mut result = Poll::Pending; let mut lines = Vec::new(); - loop { - match result { - Ok(Async::Ready(())) => break, - Ok(Async::NotReady) => { + futures::executor::block_on(future::lazy(|cx| loop { + match &result { + Poll::Ready(Ok(())) => break, + Poll::Pending => { let context = thread.context(); let debug_info = context.debug_info(); - lines.push(debug_info.stack_info(0).unwrap().line().unwrap()); + lines.extend(debug_info.stack_info(0).and_then(|s| s.line())); } - Err(err) => panic!("{}", err), + Poll::Ready(Err(err)) => panic!("{}", err), } - result = execute.poll(); - } + result = execute.poll_unpin(cx); + })); assert_eq!( lines, @@ -195,30 +188,31 @@ fn implicit_prelude_lines_not_counted() { context.set_hook(Some(Box::new(move |_, debug_info| { eprintln!("{}", debug_info.stack_info(0).unwrap().source_name()); if debug_info.stack_info(0).unwrap().source_name() == "test" { - Ok(Async::NotReady) + Poll::Pending } else { - Ok(Async::Ready(())) + Poll::Ready(Ok(())) } }))); context.set_hook_mask(HookFlags::LINE_FLAG); } - let mut execute = thread.run_expr_async::("test", "1").map(|_| ()); - let mut result = Ok(Async::NotReady); + let execute = thread.run_expr_async::("test", "1").map_ok(|_| ()); + futures::pin_mut!(execute); + let mut result = Poll::Pending; let mut lines = Vec::new(); - loop { - match result { - Ok(Async::Ready(())) => break, - Ok(Async::NotReady) => { + futures::executor::block_on(future::lazy(|cx| loop { + match &result { + Poll::Ready(Ok(())) => break, + Poll::Pending => { let context = thread.context(); let debug_info = context.debug_info(); let stack_info = debug_info.stack_info(0).unwrap(); lines.extend(stack_info.line()); } - Err(err) => panic!("{}", err), + Poll::Ready(Err(err)) => panic!("{}", err), } - result = execute.poll(); - } + result = execute.poll_unpin(cx); + })); assert_eq!(lines, vec![Line::from(0)]); } @@ -241,7 +235,7 @@ fn read_variables() { .map(|local| (local.name.declared_name().to_string(), local.typ.clone())) .collect::>(), ); - Ok(Async::Ready(())) + Poll::Ready(Ok(())) }))); context.set_hook_mask(HookFlags::LINE_FLAG); } @@ -319,7 +313,7 @@ fn argument_types() { .map(|local| (local.name.declared_name().to_string(), local.typ.clone())) .collect::>(), )); - Ok(Async::Ready(())) + Poll::Ready(Ok(())) }))); context.set_hook_mask(HookFlags::LINE_FLAG); } @@ -376,7 +370,7 @@ fn source_name() { context.set_hook(Some(Box::new(move |_, debug_context| { let stack_info = debug_context.stack_info(0).unwrap(); *result.lock().unwrap() = stack_info.source_name().to_string(); - Ok(Async::Ready(())) + Poll::Ready(Ok(())) }))); context.set_hook_mask(HookFlags::LINE_FLAG); } @@ -413,7 +407,7 @@ fn upvars() { if stack_info.source_name() == "test" { result.lock().unwrap().push(stack_info.upvars().to_owned()); } - Ok(Async::Ready(())) + Poll::Ready(Ok(())) }))); context.set_hook_mask(HookFlags::CALL_FLAG); } @@ -469,7 +463,7 @@ fn implicit_prelude_variable_names() { .filter(|local| local.name.declared_name() == "__implicit_prelude") .map(|local| local.typ.clone()), ); - Ok(Async::Ready(())) + Poll::Ready(Ok(())) }))); context.set_hook_mask(HookFlags::LINE_FLAG); } diff --git a/tests/error.rs b/tests/error.rs index aa1cff164a..adab7ec01f 100644 --- a/tests/error.rs +++ b/tests/error.rs @@ -73,12 +73,12 @@ fn undefined_infix() { vm.get_database_mut().implicit_prelude(false); - let result = expr.reparse_infix( - &mut vm.module_compiler(&vm.get_database()), + let result = futures::executor::block_on(expr.reparse_infix( + &mut vm.module_compiler(&mut vm.get_database()), &vm, "test", expr, - ); + )); match result { Err((_, Error::Parse(err))) => { let error = parser::Error::Infix(InfixError::UndefinedFixity("+".to_string())); diff --git a/tests/fail.rs b/tests/fail.rs new file mode 100644 index 0000000000..9556bd6dc6 --- /dev/null +++ b/tests/fail.rs @@ -0,0 +1 @@ + diff --git a/tests/inline.rs b/tests/inline.rs index e39450f2e5..2a48421486 100644 --- a/tests/inline.rs +++ b/tests/inline.rs @@ -1,11 +1,12 @@ +#![cfg(features = "test")] use support::*; mod support; use gluon::{self, query::Compilation, vm::core::tests::check_expr_eq, ThreadExt}; -#[test] -fn inline_cross_module() { +#[tokio::test] +async fn inline_cross_module() { let _ = env_logger::try_init(); let thread = make_vm(); @@ -25,6 +26,7 @@ fn inline_cross_module() { let db = thread.get_database(); let core_expr = db .core_expr("test".into()) + .await .unwrap_or_else(|err| panic!("{}", err)); let expected_str = r#" 3 diff --git a/tests/io.rs b/tests/io.rs index b0a979bfaf..78bab35e6f 100644 --- a/tests/io.rs +++ b/tests/io.rs @@ -8,7 +8,7 @@ use gluon::{ Thread, ThreadExt, }; -use tokio::runtime::current_thread::Runtime; +use tokio::runtime::Runtime; #[macro_use] mod support; @@ -163,7 +163,7 @@ fn spawn_on_twice() { action "#; - let mut runtime = Runtime::new().unwrap(); + let runtime = Runtime::new().unwrap(); let vm = make_vm(); vm.get_database_mut().run_io(true); let (result, _) = runtime @@ -202,7 +202,7 @@ fn spawn_on_runexpr() { wrap x.value "#; - let mut runtime = Runtime::new().unwrap(); + let runtime = Runtime::new().unwrap(); let vm = make_vm(); vm.get_database_mut().run_io(true); let (result, _) = runtime @@ -227,7 +227,7 @@ fn spawn_on_do_action_twice() { let { wrap } = import! std.applicative let { join } = import! std.monad - let counter = ref 0 + let counter = ref 0 do child = thread.new_thread () let action = thread.spawn_on child (\_ -> @@ -238,7 +238,7 @@ fn spawn_on_do_action_twice() { wrap (load counter) "#; - let mut runtime = Runtime::new().unwrap(); + let runtime = Runtime::new().unwrap(); let vm = make_vm(); vm.get_database_mut().run_io(true); let (result, _) = runtime @@ -257,7 +257,7 @@ fn spawn_on_force_action_twice() { let thread = import! std.thread let { wrap } = import! std.applicative - let counter = ref 0 + let counter = ref 0 do child = thread.new_thread () do action = thread.spawn_on child (\_ -> @@ -268,7 +268,7 @@ fn spawn_on_force_action_twice() { wrap (load counter) "#; - let mut runtime = Runtime::new().unwrap(); + let runtime = Runtime::new().unwrap(); let vm = make_vm(); vm.get_database_mut().run_io(true); let (result, _) = runtime @@ -297,7 +297,7 @@ fn spawn_on_runexpr_in_catch() { (io.catch action wrap >>= io.println) *> wrap "123" "#; - let mut runtime = Runtime::new().unwrap(); + let runtime = Runtime::new().unwrap(); let vm = make_vm(); vm.get_database_mut().run_io(true); let (result, _) = runtime diff --git a/tests/main.rs b/tests/main.rs index 08159e9e41..3b5fe514a0 100644 --- a/tests/main.rs +++ b/tests/main.rs @@ -7,9 +7,9 @@ use std::{ use { collect_mac::collect, failure_derive::Fail, - futures::{future, stream, Future, Stream}, + futures::{join, prelude::*, stream, task::SpawnExt}, serde_derive::Deserialize, - tokio::runtime::current_thread::Runtime, + structopt::StructOpt, }; use gluon::{ @@ -19,7 +19,7 @@ use gluon::{ symbol::Symbol, types::{ArcType, Type}, }, - new_vm, + new_vm_async, vm::api::{de::De, generic::A, Getable, Hole, OpaqueValue, OwnedFunction, VmType, IO}, RootedThread, Thread, ThreadExt, }; @@ -28,10 +28,16 @@ use gluon::{ enum Error { #[fail(display = "{}", _0)] Error(failure::Error), + + #[fail(display = "{}", _0)] + Tensile(tensile::Error), + #[fail(display = "{}", _0)] Io(io::Error), + #[fail(display = "{}", _0)] Gluon(gluon::Error), + #[fail(display = "{}", _0)] Message(String), } @@ -48,6 +54,12 @@ impl<'a> From<&'a str> for Error { } } +impl From for Error { + fn from(d: tensile::Error) -> Error { + Error::Tensile(d) + } +} + impl From for Error { fn from(d: failure::Error) -> Error { Error::Error(d) @@ -60,16 +72,43 @@ impl From for Error { } } +impl From for Error { + fn from(d: gluon::vm::Error) -> Error { + gluon::Error::from(d).into() + } +} + impl From for Error { fn from(d: gluon::Error) -> Error { Error::Gluon(d) } } +#[derive(StructOpt)] +#[structopt(about = "gluon tests")] +pub struct Opt { + #[structopt(long = "jobs")] + #[structopt(help = "How many threads to run in parallel")] + pub jobs: Option, + + #[structopt(name = "FILTER", help = "Filters which tests to run")] + pub filter: Vec, +} + fn main() { - if let Err(err) = main_() { - assert!(false, "{}", err); - } + let options = Opt::from_args(); + let runtime = { + let mut builder = tokio::runtime::Builder::new(); + if let Some(jobs) = options.jobs { + builder.core_threads(jobs); + } + builder.build().unwrap() + }; + runtime.block_on(async move { + if let Err(err) = main_(&options).await { + assert!(false, "{}", err); + } + }) } fn test_files(path: &str) -> Result, Error> { @@ -124,31 +163,26 @@ struct GluonTestable(F); impl tensile::Testable for GluonTestable where - F: Future + Send + Sync + 'static, + F: Future> + Send + 'static, { type Error = Error; fn test(self) -> tensile::TestFuture { - Box::new(self.0) + Box::pin(self.0) } } fn make_tensile_test(name: String, test: TestFn) -> tensile::Test { let mut test = ::std::panic::AssertUnwindSafe(test); - tensile::test(name, move || { - let future = test - .call_async(()) - .and_then(|test| { - future::result(test.vm().get_global("std.test.run_io")).and_then(|action| { - let mut action: OwnedFunction< - fn(OpaqueValue) -> IO<()>, - > = action; - action.call_async(test).map(|_| ()) - }) - }) - .map_err(gluon::Error::from) - .map_err(Error::from); - GluonTestable(::std::panic::AssertUnwindSafe(future)) + tensile::test(name, { + GluonTestable(::std::panic::AssertUnwindSafe(async move { + let test = test.call_async(()).await?; + let action = test.vm().get_global("std.test.run_io")?; + let mut action: OwnedFunction) -> IO<()>> = + action; + action.call_async(test).await?; + Ok(()) + })) }) } @@ -168,23 +202,23 @@ impl TestCase { } } -fn make_test<'t>(vm: &'t Thread, name: &str, filename: &Path) -> Result { +async fn make_test<'t>(vm: &'t Thread, name: &str, filename: &Path) -> Result { let mut file = File::open(&filename)?; let mut text = String::new(); file.read_to_string(&mut text)?; - let (De(test), _) = vm.run_expr(&name, &text)?; + let (De(test), _) = vm.run_expr_async(&name, &text).await?; Ok(test) } -fn run_file<'t>( +async fn run_file<'t>( vm: &'t Thread, name: &str, filename: &Path, -) -> Result<(OpaqueValue<&'t Thread, Hole>, ArcType), Error> { +) -> Result<(OpaqueValue, ArcType), Error> { let mut file = File::open(&filename)?; let mut text = String::new(); file.read_to_string(&mut text)?; - Ok(vm.run_expr::>(&name, &text)?) + Ok(vm.run_expr_async(&name, &text).await?) } fn gather_doc_tests(expr: &SpannedExpr) -> Vec<(String, String)> { @@ -263,7 +297,7 @@ fn gather_doc_tests(expr: &SpannedExpr) -> Vec<(String, String)> { visitor.0 } -fn run_doc_tests<'t>( +async fn run_doc_tests<'t>( vm: &'t Thread, name: &str, filename: &Path, @@ -272,36 +306,41 @@ fn run_doc_tests<'t>( let mut text = String::new(); file.read_to_string(&mut text)?; - let (expr, _, _) = vm.extract_metadata(&name, &text)?; + let (expr, _, _) = vm.extract_metadata(&name, &text).await?; - let (mut convert_test_fn, _) = - vm.run_expr:: TestFn>>("convert_test_fn", r"\x -> \_ -> x")?; + let convert_test_fn = + vm.get_global:: TestFn>>("convert_test_fn")?; let tests = gather_doc_tests(&expr); Ok(tests .into_iter() .map(move |(test_name, test_source)| { - let vm = vm.new_thread().unwrap(); - - match vm - .run_expr::(&test_name, &test_source) - .and_then(|(test, _)| Ok(convert_test_fn.call(test)?)) - { - Ok(test) => make_tensile_test(test_name, test), - Err(err) => { - let err = ::std::panic::AssertUnwindSafe(err); - tensile::test(test_name, || Err(err.0.into())) + let mut convert_test_fn = convert_test_fn.clone(); + async move { + let vm = vm.new_thread().unwrap(); + + match vm + .run_expr_async::(&test_name, &test_source) + .and_then(|(test, _)| async { Ok(convert_test_fn.call_async(test).await?) }) + .await + { + Ok(test) => make_tensile_test(test_name, test), + Err(err) => { + let err = ::std::panic::AssertUnwindSafe(err); + tensile::test(test_name, || Err(err.0.into())) + } } } }) - .collect()) + .collect::>() + .collect() + .await) } -fn main_() -> Result<(), Error> { +async fn main_(options: &Opt) -> Result<(), Error> { let _ = ::env_logger::try_init(); - let args: Vec<_> = ::std::env::args().collect(); - let filter = if args.len() > 1 && args.last().unwrap() != "main" { - args.last() + let filter = if options.filter.len() > 1 { + options.filter.last() } else { None }; @@ -309,15 +348,25 @@ fn main_() -> Result<(), Error> { let file_filter = filter.as_ref().map_or(false, |f| f.starts_with("@")); let filter = filter.as_ref().map(|f| f.trim_start_matches('@')); - let vm = new_vm(); - vm.load_file("std/test.glu")?; + let vm = new_vm_async().await; + vm.load_file_async("std/test.glu").await?; let iter = test_files("tests/pass")?.into_iter(); - let pool = futures_cpupool::CpuPool::new(1); - let mut runtime = tokio::runtime::Runtime::new()?; - let pass_tests_future = stream::futures_ordered( - iter.filter_map(|filename| { + struct TokioSpawn; + impl futures::task::Spawn for TokioSpawn { + fn spawn_obj( + &self, + future: futures::task::FutureObj<'static, ()>, + ) -> Result<(), futures::task::SpawnError> { + tokio::spawn(future); + Ok(()) + } + } + + let pool = TokioSpawn; + let pass_tests_future = iter + .filter_map(|filename| { let name = filename_to_module(filename.to_str().unwrap_or("")); match filter { @@ -329,26 +378,23 @@ fn main_() -> Result<(), Error> { let vm = vm.new_thread().unwrap(); let name2 = name.clone(); - pool.spawn_fn(move || make_test(&vm, &name, &filename)) - .then(|result| -> Result<_, Error> { - Ok(match result { - Ok(test) => test.into_tensile_test(), - Err(err) => { - let err = ::std::panic::AssertUnwindSafe(err); - tensile::test(name2, || Err(err.0)) - } - }) - }) - }), - ) - .collect(); - let pass_tests = runtime.block_on(pass_tests_future)?; + pool.spawn_with_handle(gluon::sendify(async move { + match make_test(&vm, &name, &filename).await { + Ok(test) => test.into_tensile_test(), + Err(err) => { + let err = ::std::panic::AssertUnwindSafe(err); + tensile::test(name2, || Err(err.0)) + } + } + })) + .expect("Could not spawn test future") + }) + .collect::>() + .collect::>(); - let iter = test_files("tests/fail")? + let fail_tests = test_files("tests/fail")? .into_iter() - .filter(|filename| !filename.to_string_lossy().contains("deps")); - - let fail_tests = iter + .filter(|filename| !filename.to_string_lossy().contains("deps")) .filter_map(|filename| { let name = filename_to_module(filename.to_str().unwrap_or("")); @@ -360,21 +406,27 @@ fn main_() -> Result<(), Error> { .map(|(filename, name)| { let vm = vm.new_thread().unwrap(); - tensile::test(name.clone(), move || -> Result<(), Error> { - match run_file(&vm, &name, &filename) { - Ok(err) => Err(format!( - "Expected test '{}' to fail\n{:?}", - filename.to_str().unwrap(), - err.0, - ) - .into()), - Err(_) => Ok(()), - } - }) + tensile::test( + name.clone(), + tensile::Future(std::panic::AssertUnwindSafe(gluon::sendify(async move { + match run_file(&vm, &name, &filename).await { + Ok(err) => Err(format!( + "Expected test '{}' to fail\n{:?}", + filename.to_str().unwrap(), + err.0, + ) + .into()), + Err(_) => Ok(()), + } + }))), + ) }) .collect(); - let doc_tests = test_files("std")? + vm.load_script_async("convert_test_fn", r"\x -> \_ -> x") + .await?; + + let doc_tests_future = test_files("std")? .into_iter() .filter_map(|filename| { let name = filename_to_module(filename.to_str().unwrap_or("")); @@ -386,29 +438,33 @@ fn main_() -> Result<(), Error> { }) .map(|(filename, name)| { let vm = vm.new_thread().unwrap(); - match run_doc_tests(&vm, &name, &filename) { - Ok(tests) => tensile::group(name.clone(), tests), - Err(err) => { - let err = ::std::panic::AssertUnwindSafe(err); - tensile::test(name.clone(), || Err(err.0)) + pool.spawn_with_handle(async move { + match run_doc_tests(&vm, &name, &filename).await { + Ok(tests) => tensile::group(name.clone(), tests), + Err(err) => { + let err = ::std::panic::AssertUnwindSafe(err); + tensile::test(name.clone(), || Err(err.0)) + } } - } + }) + .expect("Could not spawn test future") }) - .collect(); - - let mut runtime = Runtime::new()?; - runtime.block_on(future::lazy(|| { - tensile::console_runner( - tensile::group( - "main", - vec![ - tensile::group("pass", pass_tests), - tensile::group("fail", fail_tests), - tensile::group("doc", doc_tests), - ], - ), - &tensile::Options::default().filter(filter.map_or("", |s| &s[..])), - ) - }))?; + .collect::>() + .collect::>(); + + let (pass_tests, doc_tests) = join!(pass_tests_future, doc_tests_future); + + tensile::tokio_console_runner( + tensile::group( + "main", + vec![ + tensile::group("pass", pass_tests), + tensile::group("fail", fail_tests), + tensile::group("doc", doc_tests), + ], + ), + &tensile::Options::default().filter(filter.map_or("", |s| &s[..])), + ) + .await?; Ok(()) } diff --git a/tests/pass/thread.glu b/tests/pass/thread.glu index ea980faa55..6191870732 100644 --- a/tests/pass/thread.glu +++ b/tests/pass/thread.glu @@ -20,21 +20,21 @@ let assert_any_err = let { sender, receiver } = channel 0 let thread = spawn (\_ -> - send sender 0 - yield () - send sender 1 + let _ = send sender 0 + let _ = yield () + let _ = send sender 1 () ) resume thread let tests : TestEff r () = - assert_eq (recv receiver) (Ok 0) *> ( - seq assert_eq (recv receiver) (Err ()) - resume thread - assert_eq (recv receiver) (Ok 1) - ) *> ( - seq assert_eq (recv receiver) (Err ()) - assert_any_err (resume thread) (Err "Any error message here") - ) + seq assert_eq (recv receiver) (Ok 0) + + seq assert_eq (recv receiver) (Err ()) + let _ = resume thread + seq assert_eq (recv receiver) (Ok 1) + + seq assert_eq (recv receiver) (Err ()) + assert_any_err (resume thread) (Err "Any error message here") test "thread" <| \_ -> tests diff --git a/tests/serialization.rs b/tests/serialization.rs index 74520fe1c9..b33176bf30 100644 --- a/tests/serialization.rs +++ b/tests/serialization.rs @@ -1,20 +1,12 @@ #![cfg(feature = "serialization")] -extern crate env_logger; -extern crate futures; -extern crate serde_json; extern crate serde_state as serde; -extern crate walkdir; - -extern crate gluon; use std::{fs::File, io::Read}; -use futures::Future; - use crate::serde::ser::SerializeState; use gluon::{ - new_vm, + new_vm, new_vm_async, vm::{ api::{Hole, OpaqueValue, IO}, serialization::{DeSeed, SeSeed}, @@ -119,7 +111,7 @@ fn roundtrip_std_libs() { // Can't check the extension since vim swap files ".glu.swp" will report ".glu" as the // extension let path_str = path.to_str().unwrap(); - if path.to_str().unwrap().ends_with(".glu") && + if path.to_str().unwrap().ends_with(".glu") && path_str.starts_with("std/regex") && path_str.starts_with("std/repl") && path_str.starts_with("std/stream") && @@ -144,11 +136,11 @@ fn roundtrip_std_libs() { roundtrip(&thread, &value); } -#[test] -fn precompile() { +#[tokio::test] +async fn precompile() { use gluon::compiler_pipeline::*; - let thread = new_vm(); + let thread = new_vm_async().await; let mut text = String::new(); File::open("std/map.glu") .expect("Unable to open map.glu") @@ -160,32 +152,33 @@ fn precompile() { let mut serializer = serde_json::Serializer::new(&mut buffer); thread .compile_to_bytecode("test", &text, &mut serializer) + .await .unwrap() } let precompiled_result = { let mut deserializer = serde_json::Deserializer::from_slice(&buffer); Precompiled(&mut deserializer) .run_expr( - &mut thread.module_compiler(&thread.get_database()), + &mut thread.module_compiler(&mut thread.get_database()), &*thread, "test", "", (), ) - .wait() + .await .unwrap() }; - let thread2 = new_vm(); + let thread2 = new_vm_async().await; assert_eq!( serialize_value( text.run_expr( - &mut thread.module_compiler(&thread2.get_database()), + &mut thread.module_compiler(&mut thread2.get_database()), &*thread2, "test", &text, None ) - .wait() + .await .unwrap() .value .get_variant() diff --git a/tests/support/mod.rs b/tests/support/mod.rs index c8ada5a4f3..32b5d69d3a 100644 --- a/tests/support/mod.rs +++ b/tests/support/mod.rs @@ -42,7 +42,11 @@ where /// Creates a VM for testing which has the correct paths to import the std library properly pub fn make_vm() -> RootedThread { - let vm = ::gluon::VmBuilder::new().build(); + futures::executor::block_on(make_vm_async()) +} + +pub async fn make_vm_async() -> RootedThread { + let vm = ::gluon::VmBuilder::new().build_async().await; let import = vm.get_macros().get("import"); import .as_ref() diff --git a/tests/vm.rs b/tests/vm.rs index 2dd2acf79b..cc4da712a2 100644 --- a/tests/vm.rs +++ b/tests/vm.rs @@ -782,10 +782,10 @@ g 10 } } -#[test] -fn completion_with_prelude() { +#[tokio::test] +async fn completion_with_prelude() { let _ = ::env_logger::try_init(); - let vm = make_vm(); + let vm = make_vm_async().await; let source = r#" let prelude = import! std.prelude @@ -813,7 +813,8 @@ let from f : (Int -> Option a) -> Stream a = "#; let (expr, _) = vm - .typecheck_str("example", source, None) + .typecheck_str_async("example", source, None) + .await .unwrap_or_else(|err| panic!("{}", err)); let lines = vm.get_database().get_filemap("example").expect("file_map"); @@ -827,15 +828,16 @@ let from f : (Int -> Option a) -> Stream a = assert_eq!(result, Ok(Type::int())); } -#[test] -fn completion_with_prelude_at_0() { +#[tokio::test] +async fn completion_with_prelude_at_0() { let _ = ::env_logger::try_init(); - let vm = make_vm(); + let vm = make_vm_async().await; let expr = "1"; let (expr, _) = vm - .typecheck_str("example", expr, None) + .typecheck_str_async("example", expr, None) + .await .unwrap_or_else(|err| panic!("{}", err)); let file_map = vm.get_database().get_filemap("example").expect("file_map"); @@ -844,15 +846,16 @@ fn completion_with_prelude_at_0() { assert_eq!(result, Ok(Type::int())); } -#[test] -fn suggestion_from_implicit_prelude() { +#[tokio::test] +async fn suggestion_from_implicit_prelude() { let _ = ::env_logger::try_init(); - let vm = make_vm(); + let vm = make_vm_async().await; let expr = "1 "; let (expr, _) = vm - .typecheck_str("example", expr, None) + .typecheck_str_async("example", expr, None) + .await .unwrap_or_else(|err| panic!("{}", err)); let lines = vm.get_database().get_filemap("example").expect("file_map"); @@ -867,14 +870,15 @@ fn suggestion_from_implicit_prelude() { /// Would cause panics in `Source` as the spans from the implicit prelude were used with the /// `Source` from the normal expression -#[test] -fn dont_use_the_implicit_prelude_span_in_the_top_expr() { +#[tokio::test] +async fn dont_use_the_implicit_prelude_span_in_the_top_expr() { let _ = ::env_logger::try_init(); - let vm = make_vm(); + let vm = make_vm_async().await; let expr = "1"; - vm.typecheck_str("example", expr, Some(&Type::float())) + vm.typecheck_str_async("example", expr, Some(&Type::float())) + .await .unwrap_err(); } @@ -1074,7 +1078,7 @@ r#" rec type Eff (r : Type -> Type) a = | Pure a - | Impure : forall x . Arr r x a -> Eff r a + | Impure : forall x . Arr r x a -> Eff r a type Arr r a b = a -> Eff r b in diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 0b69f0196b..f9c3f2864e 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -17,6 +17,7 @@ documentation = "https://docs.rs/gluon" travis-ci = { repository = "gluon-lang/gluon" } [dependencies] +async-trait = "0.1" bitflags = "1.0.0" codespan = "0.3" codespan-reporting = "0.3" @@ -25,11 +26,12 @@ downcast-rs = "1" difference = { version = "2", optional = true } crossbeam-utils = "0.6" frunk_core = "0.3" -futures = "0.1.0" +futures = { version = "0.3.0", features = ["compat", "async-await"] } itertools = "0.8" lalrpop-util = { version = "0.17", optional = true } log = "0.4" ordered-float = "1" +parking_lot = "0.9" petgraph = "0.4" pretty = "0.5" quick-error = "1.1.0" diff --git a/vm/src/api/function.rs b/vm/src/api/function.rs index a72b96ad03..dfb7b6e611 100644 --- a/vm/src/api/function.rs +++ b/vm/src/api/function.rs @@ -4,7 +4,11 @@ use std::marker::PhantomData; #[cfg(feature = "serde")] use crate::serde::{Deserialize, Deserializer}; -use futures::{future, Async, Future}; +use futures::{ + prelude::*, + ready, + task::{self, Poll}, +}; use crate::base::symbol::Symbol; use crate::base::types::ArcType; @@ -305,12 +309,34 @@ where $($args: Getable<'vm, 'vm> + 'vm,)* r }; - context.stack().release_lock(lock); + r.async_status_push(&mut context, lock, frame_index) + } +} - r.async_status_push(&mut context, frame_index) } } +fn block_on_sync(f: F) -> F::Output +where + F: Future>, +{ + use std::task::{Context, RawWaker, RawWakerVTable, Waker}; + + static VTABLE: RawWakerVTable = RawWakerVTable::new( + |p| RawWaker::new(p, &VTABLE), + |_| unreachable!(), + |_| unreachable!(), + |_| (), + ); + + let waker_state = (); + let waker = unsafe { Waker::from_raw(RawWaker::new(&waker_state, &VTABLE)) }; + let mut context = Context::from_waker(&waker); + + futures::pin_mut!(f); + match f.poll(&mut context) { + Poll::Ready(value) => value, + Poll::Pending => Err(Error::Message("Unexpected async".into())).into(), } } @@ -358,14 +384,16 @@ impl Function R> { #[allow(non_snake_case)] pub fn call(&mut self $(, $args: $args)*) -> Result { - match self.call_first($($args),*)? { - Async::Ready(value) => Ok(value), - Async::NotReady => Err(Error::Message("Unexpected async".into())), - } + $( + let mut $args = Some($args); + )* + block_on_sync(future::poll_fn(|cx| { + self.call_first(cx, $($args.take().unwrap()),*) + })) } #[allow(non_snake_case)] - fn call_first(&self $(, $args: $args)*) -> Result> { + fn call_first(&self, cx: &mut task::Context<'_> $(, $args: $args)*) -> Poll> { let vm = self.value.vm(); let mut context = vm.current_context(); context.push(self.value.get_variant()); @@ -376,18 +404,14 @@ impl Function R> 0.push(&mut context).unwrap(); } let args = count!($($args),*) + R::extra_args(); - match vm.call_function(context.into_owned(), args)? { - Async::Ready(context) => { - let mut context = context.unwrap(); - let result = { - let value = context.stack.last().unwrap(); - Self::return_value(vm, value).map(Async::Ready) - }; - context.stack.pop(); - result - } - Async::NotReady => Ok(Async::NotReady), - } + let context = ready!(vm.call_function(cx, context.into_owned(), args))?; + let mut context = context.unwrap(); + let result = { + let value = context.stack.last().unwrap(); + Self::return_value(vm, value) + }; + context.stack.pop(); + Poll::Ready(result) } fn return_value(vm: &Thread, value: Variants) -> Result { @@ -401,54 +425,21 @@ impl Function R> R: VmType + for<'x, 'value> Getable<'x, 'value> + Send + Sync + 'static, { #[allow(non_snake_case)] - pub fn call_async( + pub async fn call_async( &mut self $(, $args: $args)* - ) -> Box + Send + Sync + 'static> + ) -> Result { use crate::thread::Execute; - use futures::IntoFuture; - - match self.call_first($($args),*) { - Ok(ok) => { - match ok { - Async::Ready(value) => Box::new(Ok(value).into_future()), - Async::NotReady => { - Box::new( - Execute::new(self.value.vm().root_thread()) - .and_then(|value| Self::return_value(value.vm(), value.get_variant())) - ) - } - } - } - Err(err) => { - Box::new(Err(err).into_future()) - } - } - } - - #[allow(non_snake_case)] - pub fn call_fast_async( - &mut self - $(, $args: $args)* - ) -> Box + Send + Sync + 'static> - { - use crate::thread::Execute; - - match self.call_first($($args),*) { - Ok(ok) => { - match ok { - Async::Ready(value) => Box::new(future::ok(value)), - Async::NotReady => { - Box::new( - Execute::new(self.value.vm().root_thread()) - .and_then(|value| Self::return_value(value.vm(), value.get_variant())) - ) - } - } - } - Err(err) => { - Box::new(future::err(err)) + $( + let mut $args = Some($args); + )* + match future::poll_fn(|cx| Poll::Ready(self.call_first(cx, $($args.take().unwrap()),*))).await { + Poll::Ready(result) => result, + Poll::Pending => { + let vm = self.value.vm().root_thread(); + let value = Execute::new(vm).await?; + Self::return_value(value.vm(), value.get_variant()) } } } diff --git a/vm/src/api/mod.rs b/vm/src/api/mod.rs index 85d6f90635..c5318be033 100644 --- a/vm/src/api/mod.rs +++ b/vm/src/api/mod.rs @@ -21,13 +21,14 @@ use crate::base::{ use crate::{ forget_lifetime, gc::{CloneUnrooted, DataDef, GcRef, Move, Trace}, + stack::Lock, thread::{RootedThread, ThreadInternal, VmRoot, VmRootInternal}, types::{VmIndex, VmInt, VmTag}, value::{ArrayDef, ArrayRepr, ClosureData, DataStruct, Value, ValueArray, ValueRepr}, vm::{self, RootedValue, Status, Thread}, Error, Result, Variants, }; -use futures::{Async, Future}; +use futures::{task::Poll, Future}; pub use self::{ function::*, @@ -470,24 +471,33 @@ pub trait AsyncPushable<'vm> { /// to the stack and `Ok(())` should be returned. If the call is unsuccessful `Status:Error` /// should be returned and the stack should be left intact. /// - /// If the value must be computed asynchronously `Async::NotReady` must be returned so that + /// If the value must be computed asynchronously `Poll::Pending` must be returned so that /// the virtual machine knows it must do more work before the value is available. - fn async_push(self, context: &mut ActiveThread<'vm>, frame_index: VmIndex) - -> Result>; + fn async_push( + self, + context: &mut ActiveThread<'vm>, + lock: Lock, + frame_index: VmIndex, + ) -> Poll>; - fn async_status_push(self, context: &mut ActiveThread<'vm>, frame_index: VmIndex) -> Status + fn async_status_push( + self, + context: &mut ActiveThread<'vm>, + lock: Lock, + frame_index: VmIndex, + ) -> Status where Self: Sized, { - match self.async_push(context, frame_index) { - Ok(Async::Ready(())) => Status::Ok, - Ok(Async::NotReady) => Status::Yield, - Err(err) => { + match self.async_push(context, lock, frame_index) { + Poll::Ready(Ok(())) => Status::Ok, + Poll::Ready(Err(err)) => { let mut context = context.context(); let msg = context.gc.alloc_ignore_limit(format!("{}", err).as_str()); context.stack.push(Variants::from(msg)); Status::Error } + Poll::Pending => Status::Yield, } } } @@ -496,8 +506,14 @@ impl<'vm, T> AsyncPushable<'vm> for T where T: Pushable<'vm>, { - fn async_push(self, context: &mut ActiveThread<'vm>, _: VmIndex) -> Result> { - self.push(context).map(Async::Ready) + fn async_push( + self, + context: &mut ActiveThread<'vm>, + lock: Lock, + _: VmIndex, + ) -> Poll> { + context.stack().release_lock(lock); + Poll::Ready(self.push(context)) } } @@ -1434,11 +1450,10 @@ impl<'vm, 'value, T: Getable<'vm, 'value>, E: Getable<'vm, 'value>> Getable<'vm, pub struct FutureResult(pub F); impl FutureResult { - #[inline] pub fn new<'vm>(f: F) -> Self where - F: Future + Send + 'static, - F::Item: Pushable<'vm>, + F: Future + Send + 'vm, + F::Output: Pushable<'vm>, { FutureResult(f) } @@ -1447,35 +1462,37 @@ impl FutureResult { impl VmType for FutureResult where F: Future, - F::Item: VmType, + F::Output: VmType, { - type Type = ::Type; + type Type = ::Type; fn make_type(vm: &Thread) -> ArcType { - ::make_type(vm) + ::make_type(vm) } fn extra_args() -> VmIndex { - ::extra_args() + ::extra_args() } } impl<'vm, F> AsyncPushable<'vm> for FutureResult where - F: Future + Send + 'static, - F::Item: Pushable<'vm>, + F: Future + Send + 'vm, + F::Output: Pushable<'vm>, { fn async_push( self, context: &mut ActiveThread<'vm>, + lock: Lock, frame_index: VmIndex, - ) -> Result> { + ) -> Poll> { unsafe { - context.return_future(self.0, frame_index); + context.return_future(self.0, lock, frame_index); } - Ok(Async::Ready(())) + Poll::Ready(Ok(())) } } -pub enum RuntimeResult { +#[derive(Clone)] +pub enum RuntimeResult { Return(T), Panic(E), } diff --git a/vm/src/channel.rs b/vm/src/channel.rs index 378fec12c3..dd313fc01b 100644 --- a/vm/src/channel.rs +++ b/vm/src/channel.rs @@ -10,7 +10,9 @@ use crate::real_std::{ use futures::{ future::{self, Either}, - Future, + prelude::*, + task::Poll, + try_join, }; use crate::base::types::{ArcType, Type}; @@ -18,15 +20,15 @@ use crate::base::types::{ArcType, Type}; use crate::{ api::{ generic::{A, B}, - primitive, Function, FunctionRef, Generic, Getable, OpaqueRef, OpaqueValue, OwnedFunction, - Pushable, Pushed, RuntimeResult, Unrooted, VmType, WithVM, IO, + Function, FunctionRef, Generic, Getable, OpaqueRef, OpaqueValue, OwnedFunction, Pushable, + Pushed, RuntimeResult, Unrooted, VmType, WithVM, IO, }, gc::{self, CloneUnrooted, GcPtr, Trace}, stack::{ClosureState, ExternState, State}, thread::{ActiveThread, ThreadInternal}, types::VmInt, value::{Callable, Userdata, Value, ValueRepr}, - vm::{RootedThread, Status, Thread}, + vm::{RootedThread, Thread}, Error, ExternModule, Result as VmResult, Variants, }; @@ -154,20 +156,35 @@ fn send(sender: &Sender, value: Generic) -> Result<(), ()> { Ok(sender.send(value.get_value())) } -fn resume(child: RootedThread) -> RuntimeResult, String> { - let result = child.resume(); +async fn resume(child: RootedThread) -> RuntimeResult, String> { + let result = future::lazy(|cx| child.resume(cx)).await; match result { - Ok(_) => RuntimeResult::Return(Ok(())), - Err(Error::Dead) => RuntimeResult::Return(Err("Attempted to resume a dead thread".into())), - Err(err) => { - let fmt = format!("{}", err); - RuntimeResult::Panic(fmt) - } + Poll::Pending => RuntimeResult::Return(Ok(())), + Poll::Ready(result) => match result { + Ok(_) => RuntimeResult::Return(Ok(())), + Err(Error::Dead) => { + RuntimeResult::Return(Err("Attempted to resume a dead thread".into())) + } + Err(err) => { + let fmt = format!("{}", err); + RuntimeResult::Panic(fmt) + } + }, } } -extern "C" fn yield_(_vm: &Thread) -> Status { - Status::Yield +async fn yield_(_: ()) { + let mut first = true; + future::poll_fn(|cx| { + if first { + cx.waker().wake_by_ref(); + first = false; + Poll::Pending + } else { + Poll::Ready(()) + } + }) + .await } fn spawn<'vm>( @@ -230,8 +247,7 @@ fn spawn_on<'vm>( impl Userdata for SpawnFuture where F: Future + Send + 'static, - F::Item: Send + Sync, - F::Error: Send + Sync, + F::Output: Send + Sync, { } @@ -245,30 +261,32 @@ fn spawn_on<'vm>( impl VmType for SpawnFuture where F: Future, - F::Item: VmType, + F::Output: VmType, { - type Type = ::Type; + type Type = ::Type; } fn push_future_wrapper(context: &mut ActiveThread, _: &G) where - G: Future>>, Error = Error> + Send + 'static, + G: Future>>, Error>> + + Send + + 'static, { extern "C" fn future_wrapper( data: &SpawnFuture, - ) -> impl Future>>, Error = Error> + ) -> impl Future>>, Error>> where - F: Future>>, Error = Error> + F: Future>>, Error>> + Send + 'static, { let future = data.0.clone(); - future.map(|v| (*v).clone()).map_err(|err| (*err).clone()) + future } primitive!(1, "unknown", async fn future_wrapper::, [G] - [G: Future>>, Error = Error> + [G: Future>>, Error>> + Send + 'static, ] @@ -281,7 +299,7 @@ fn spawn_on<'vm>( let WithVM { vm, value: action } = action; let mut action = OwnedFunction::>::from_value(&thread, action.get_variant()); - let future = future::lazy(move || action.call_async(())); + let future = async move { action.call_async(()).map(RuntimeResult::from).await }; let mut context = vm.current_context(); @@ -308,24 +326,22 @@ fn spawn_on<'vm>( fn join( WithVM { vm: vm_a, value: a }: WithVM>>, b: OpaqueRef>, -) -> impl Future, Generic)>, Error = Error> { - let vm_b = try_future!(vm_a.new_thread(), Either::B); +) -> impl Future, Generic)>, Error>> { + let vm_b = match vm_a.new_thread() { + Ok(vm) => vm, + Err(err) => return Either::Right(future::ready(RuntimeResult::Panic(err))), + }; let mut action_a: OwnedFunction OpaqueValue> = Getable::from_value(&vm_a, a.get_variant()); let mut action_b: OwnedFunction OpaqueValue> = Getable::from_value(&vm_b, b.get_variant()); - Either::A( - action_a - .call_fast_async(()) - .join(action_b.call_fast_async(())) - .then(|result| { - trace!("join done: {:?}", result); - result - }) - .map(IO::Value), - ) + Either::Left(async move { + let result = try_join!(action_a.call_async(()), action_b.call_async(())); + trace!("join done: {:?}", result); + result.map(IO::Value).into() + }) } fn new_thread(WithVM { vm, .. }: WithVM<()>) -> IO { @@ -372,8 +388,8 @@ pub fn load_thread<'vm>(vm: &'vm Thread) -> VmResult { ExternModule::new( vm, record! { - resume => primitive!(1, std::thread::prim::resume), - (yield_ "yield") => primitive::("std.thread.prim.yield", yield_), + resume => primitive!(1, async fn std::thread::prim::resume), + (yield_ "yield") => primitive!(1, "std.thread.prim.yield", async fn std::thread::prim::yield_), spawn => primitive!(1, std::thread::prim::spawn), spawn_on => primitive!(2, std::thread::prim::spawn_on), new_thread => primitive!(1, std::thread::prim::new_thread), diff --git a/vm/src/gc.rs b/vm/src/gc.rs index c4036cd6f6..ad5ef08fbc 100644 --- a/vm/src/gc.rs +++ b/vm/src/gc.rs @@ -506,7 +506,6 @@ where } } - deref_trace! { ['a, T: Trace] Borrow<'a, T> } unsafe impl<'a, T> DataDef for Borrow<'a, T> @@ -756,8 +755,8 @@ pub trait CollectScope { /// A type unsafe implementing Trace must call trace on each of its fields /// which in turn contains `GcPtr` pub unsafe trait Trace { - unsafe fn root(&mut self) { } - unsafe fn unroot(&mut self) { } + unsafe fn root(&mut self) {} + unsafe fn unroot(&mut self) {} fn trace(&self, gc: &mut Gc) { let _ = gc; @@ -857,7 +856,6 @@ macro_rules! construct_gc { }; } - deref_trace! { ['a, T: ?Sized + Trace] &'a T } deref_trace_mut! { ['a, T: ?Sized + Trace] &'a mut T } deref_trace_mut! { ['a, T: ?Sized + Trace] Box } @@ -941,7 +939,7 @@ where } } - // Don't root/unroot the contents as an unrooted value could be moved out of the Mutex +// Don't root/unroot the contents as an unrooted value could be moved out of the Mutex unsafe impl Trace for sync::Mutex where T: Trace, @@ -951,7 +949,7 @@ where } } - // Don't root/unroot the contents as an unrooted value could be moved out of the RwLock +// Don't root/unroot the contents as an unrooted value could be moved out of the RwLock unsafe impl Trace for sync::RwLock where T: Trace, @@ -970,6 +968,24 @@ where } } +unsafe impl Trace for parking_lot::RwLock +where + T: Trace, +{ + fn trace(&self, gc: &mut Gc) { + self.read().trace(gc) + } +} + +unsafe impl Trace for parking_lot::RwLockReadGuard<'_, T> +where + T: Trace, +{ + fn trace(&self, gc: &mut Gc) { + (&**self).trace(gc) + } +} + unsafe impl Trace for [U] where U: Trace, diff --git a/vm/src/lazy.rs b/vm/src/lazy.rs index 4203826b50..418d6f5ce2 100644 --- a/vm/src/lazy.rs +++ b/vm/src/lazy.rs @@ -1,14 +1,16 @@ use crate::real_std::{any::Any, fmt, marker::PhantomData, sync::Mutex}; use futures::{ + channel::oneshot, future::{self, Either, Shared}, - sync::oneshot, + prelude::*, Future, }; use crate::{ api::{ - generic::A, FunctionRef, Getable, OpaqueValue, Pushable, Pushed, Userdata, VmType, WithVM, + generic::A, Getable, OpaqueValue, OwnedFunction, Pushable, Pushed, RuntimeResult, Userdata, + VmType, WithVM, }, base::types::{self, ArcType}, gc::{CloneUnrooted, GcPtr, GcRef, Move, Trace}, @@ -95,7 +97,7 @@ where fn force( WithVM { vm, value: lazy }: WithVM<&Lazy>, -) -> impl Future, Error = Error> { +) -> impl Future, Error>> { let mut lazy_lock = lazy.value.lock().unwrap(); let lazy: GcPtr> = unsafe { GcPtr::from_raw(lazy) }; let thunk = match *lazy_lock { @@ -104,20 +106,20 @@ fn force( }; match thunk { Some(value) => { - let mut function = FunctionRef:: OpaqueValue>::from_value( + let mut function = OwnedFunction:: OpaqueValue>::from_value( vm, value.get_variants(), ); *lazy_lock = Lazy_::Blackhole(vm as *const Thread as usize, None); drop(lazy_lock); let vm = vm.root_thread(); - Either::B(Either::A(function.call_fast_async(()).then( - move |result| match result { + Either::Right(Either::Left(async move { + match function.call_async(()).await { Ok(value) => { { let value = match lazy.thread.deep_clone_value(&vm, value.get_value()) { Ok(value) => value, - Err(err) => return Err(err.to_string().into()), + Err(err) => return RuntimeResult::Panic(err.to_string().into()), }; let mut lazy_lock = lazy.value.lock().unwrap(); match *lazy_lock { @@ -134,17 +136,19 @@ fn force( } } value.push(&mut vm.current_context()).unwrap(); - Ok(Pushed::default()) + RuntimeResult::Return(Pushed::default()) } - Err(err) => Err(format!("{}", err).into()), - }, - ))) + Err(err) => RuntimeResult::Panic(format!("{}", err).into()), + } + })) } None => match *lazy_lock { Lazy_::Blackhole(ref evaluating_thread, _) if *evaluating_thread == vm as *const Thread as usize => { - Either::A(future::err("<>".to_string().into())) + Either::Left(future::ready(RuntimeResult::Panic( + "<>".to_string().into(), + ))) } Lazy_::Blackhole(_, ref mut opt) => { // The current thread was not the one that started evaluating the lazy value. @@ -156,26 +160,24 @@ fn force( } let ready = opt.as_ref().unwrap().1.clone(); let vm = vm.root_thread(); - Either::B(Either::B( + Either::Right(Either::Right( ready - .map_err(|_| { - panic!("Lazy: Sender where dropped before sending that the lazy value were evaluated") - }) .map(move |_| { let lazy_lock = lazy.value.lock().unwrap(); match *lazy_lock { - Lazy_::Value(ref value) => { + Lazy_::Value(ref value) => { vm.current_context().push(value.clone()); Pushed::default() } - _ => unreachable!() + _ => unreachable!(), } - }), + }) + .map(RuntimeResult::Return), )) } Lazy_::Value(ref value) => { vm.current_context().push(value.clone()); - Either::A(future::ok(Pushed::default())) + Either::Left(future::ready(RuntimeResult::Return(Pushed::default()))) } _ => unreachable!(), }, diff --git a/vm/src/lib.rs b/vm/src/lib.rs index f242273fe1..1c56a4675c 100644 --- a/vm/src/lib.rs +++ b/vm/src/lib.rs @@ -32,19 +32,7 @@ extern crate gluon_codegen; #[macro_use] extern crate pretty_assertions; -macro_rules! try_future { - ($e:expr) => { - try_future!($e, Box::new) - }; - ($e:expr, $f:expr) => { - match $e { - Ok(x) => x, - Err(err) => return $f(::futures::future::err(err.into())), - } - }; -} - -pub type BoxFuture<'vm, T, E> = Box + Send + 'vm>; +pub type BoxFuture<'vm, T, E> = futures::future::BoxFuture<'vm, std::result::Result>; macro_rules! alloc { ($context: ident, $data: expr) => { @@ -225,7 +213,10 @@ impl<'a> fmt::Display for Panic<'a> { } } -pub type ExternLoader = Box Result + Send + Sync>; +pub struct ExternLoader { + pub load_fn: Box Result + Send + Sync>, + pub dependencies: Vec, +} pub struct ExternModule { pub metadata: Metadata, diff --git a/vm/src/macros.rs b/vm/src/macros.rs index 65079adad7..72f2aa87fd 100644 --- a/vm/src/macros.rs +++ b/vm/src/macros.rs @@ -3,13 +3,14 @@ use std::{ any::{Any, TypeId}, error::Error as StdError, fmt, mem, + pin::Pin, sync::{Arc, RwLock}, }; use { codespan_reporting::Diagnostic, downcast_rs::{impl_downcast, Downcast}, - futures::Future, + futures::{prelude::*, task::Spawn}, }; use gluon_codegen::Trace; @@ -23,11 +24,15 @@ use crate::base::{ symbol::{Symbol, Symbols}, }; -use crate::{gc::Trace, thread::Thread}; +use crate::{ + gc::Trace, + thread::{RootedThread, Thread}, +}; pub type SpannedError = Spanned; pub type Errors = BaseErrors; -pub type MacroFuture = Box, Error = Error> + Send>; +pub type MacroFuture<'a> = + Pin, Error>> + Send + 'a>>; pub trait DowncastArc: Downcast { fn into_arc_any(self: Arc) -> Arc; @@ -196,7 +201,11 @@ pub trait Macro: Trace + DowncastArc + Send + Sync { None } - fn expand(&self, env: &mut MacroExpander, args: Vec>) -> MacroFuture; + fn expand<'a>( + &self, + env: &mut MacroExpander<'a>, + args: Vec>, + ) -> MacroFuture<'a>; } impl_downcast!(Macro); @@ -215,6 +224,7 @@ impl dyn Macro { } } +#[async_trait::async_trait] impl Macro for Box where M: Macro + ?Sized, @@ -228,11 +238,16 @@ where (**self).get_capability_impl(thread, arc_self, id) } - fn expand(&self, env: &mut MacroExpander, args: Vec>) -> MacroFuture { + fn expand<'a>( + &self, + env: &mut MacroExpander<'a>, + args: Vec>, + ) -> MacroFuture<'a> { (**self).expand(env, args) } } +#[async_trait::async_trait] impl Macro for Arc where M: Macro + ?Sized, @@ -246,11 +261,19 @@ where (**self).get_capability_impl(thread, arc_self, id) } - fn expand(&self, env: &mut MacroExpander, args: Vec>) -> MacroFuture { + fn expand<'a>( + &self, + env: &mut MacroExpander<'a>, + args: Vec>, + ) -> MacroFuture<'a> { (**self).expand(env, args) } } +pub trait MacroUserdata: Send + Sync { + fn fork(&self, thread: RootedThread) -> Box; +} + /// Type containing macros bound to symbols which can be applied on an AST expression to transform /// it. #[derive(Trace, Default)] @@ -306,35 +329,52 @@ impl MacroEnv { } /// Runs the macros in this `MacroEnv` on `expr` using `env` as the context of the expansion - pub fn run( + pub async fn run( &self, vm: &Thread, - user_data: &dyn Any, + userdata: &(dyn MacroUserdata + '_), + spawn: Option<&(dyn Spawn + Send + Sync + '_)>, symbols: &mut Symbols, expr: &mut SpannedExpr, ) -> Result<(), Errors> { - let mut expander = MacroExpander::new(vm, user_data); - expander.run(symbols, expr); + let mut expander = MacroExpander::new(vm, userdata, spawn); + expander.run(symbols, expr).await; expander.finish() } } pub struct MacroExpander<'a> { - pub state: FnvMap>, + pub state: FnvMap>, pub vm: &'a Thread, pub errors: Errors, - pub user_data: &'a dyn Any, + pub userdata: &'a (dyn MacroUserdata + 'a), + pub spawn: Option<&'a (dyn Spawn + Send + Sync + 'a)>, macros: &'a MacroEnv, } impl<'a> MacroExpander<'a> { - pub fn new(vm: &'a Thread, user_data: &'a dyn Any) -> MacroExpander<'a> { + pub fn new( + vm: &'a Thread, + userdata: &'a (dyn MacroUserdata + 'a), + spawn: Option<&'a (dyn Spawn + Send + Sync + 'a)>, + ) -> MacroExpander<'a> { MacroExpander { vm: vm, - state: FnvMap::default(), macros: vm.get_macros(), - user_data, + userdata, + spawn, + errors: Errors::new(), + } + } + + pub fn fork(&self) -> MacroExpander<'a> { + MacroExpander { + vm: self.vm, + state: FnvMap::default(), + macros: self.macros, + userdata: self.userdata, + spawn: self.spawn, errors: Errors::new(), } } @@ -347,7 +387,7 @@ impl<'a> MacroExpander<'a> { } } - pub fn run(&mut self, symbols: &mut Symbols, expr: &mut SpannedExpr) { + pub async fn run(&mut self, symbols: &mut Symbols, expr: &mut SpannedExpr) { { let mut visitor = MacroVisitor { expander: self, @@ -358,21 +398,33 @@ impl<'a> MacroExpander<'a> { visitor.visit_expr(expr); while !visitor.exprs.is_empty() { - for (expr, future) in mem::replace(&mut visitor.exprs, Vec::new()) { - match future.wait() { - Ok(mut replacement) => { - replacement.span = expr.span; - replace_expr(expr, replacement); - visitor.visit_expr(expr); + visitor + .exprs + .drain(..) + .map(|(expr, future)| { + async { + let result = future.await; + (expr, result) } - Err(err) => { - let expr_span = expr.span; - replace_expr(expr, pos::spanned(expr_span, Expr::Error(None))); + }) + .collect::>() + .for_each(|(expr, result)| { + match result { + Ok(mut replacement) => { + replacement.span = expr.span; + replace_expr(expr, replacement); + visitor.visit_expr(expr); + } + Err(err) => { + let expr_span = expr.span; + replace_expr(expr, pos::spanned(expr_span, Expr::Error(None))); - visitor.expander.errors.push(pos::spanned(expr.span, err)); + visitor.expander.errors.push(pos::spanned(expr.span, err)); + } } - } - } + async {} + }) + .await; } } if self.errors.has_errors() { @@ -396,7 +448,7 @@ fn replace_expr(expr: &mut SpannedExpr, new: SpannedExpr) { struct MacroVisitor<'a: 'b, 'b, 'c> { expander: &'b mut MacroExpander<'a>, symbols: &'c mut Symbols, - exprs: Vec<(&'c mut SpannedExpr, MacroFuture)>, + exprs: Vec<(&'c mut SpannedExpr, MacroFuture<'a>)>, } impl<'a, 'b, 'c> MutVisitor<'c> for MacroVisitor<'a, 'b, 'c> { diff --git a/vm/src/serialization.rs b/vm/src/serialization.rs index 54f7f5bb37..80f8b5a9e9 100644 --- a/vm/src/serialization.rs +++ b/vm/src/serialization.rs @@ -418,6 +418,33 @@ pub mod borrow { } } +pub mod rw_lock { + use super::*; + + pub fn deserialize<'de, D, T, Seed>( + seed: &mut Seed, + deserializer: D, + ) -> Result, D::Error> + where + D: Deserializer<'de>, + T: DeserializeState<'de, Seed>, + { + T::deserialize_state(seed, deserializer).map(parking_lot::RwLock::new) + } + + pub fn serialize( + t: &parking_lot::RwLock, + serializer: S, + seed: &Seed, + ) -> Result + where + S: Serializer, + T: SerializeState, + { + t.read().serialize_state(serializer, seed) + } +} + pub mod typ { use super::*; use crate::base::symbol::Symbol; diff --git a/vm/src/stack.rs b/vm/src/stack.rs index 04e38380c3..0b75c6b9f1 100644 --- a/vm/src/stack.rs +++ b/vm/src/stack.rs @@ -422,17 +422,23 @@ impl Stack { } fn assert_pop(&self, count: VmIndex) { + let frame = self.frames.last().unwrap(); let args = if let State::Extern(ExternState { locked: Some(args), .. - }) = self.frames.last().unwrap().state + }) = frame.state { args } else { 0 }; assert!( - self.len() >= count + args, - "Attempted to pop value which did not belong to the current frame" + self.len() >= frame.offset + count + args, + "Attempted to pop value which did not belong to the current frame: {}", + match &self.frames.last().unwrap().state { + State::Extern(ext) => ext.function.id.as_str(), + State::Closure(closure) => closure.closure.function.name.as_str(), + State::Unknown => "", + } ); } @@ -497,6 +503,7 @@ impl Stack { } pub fn remove_range(&mut self, from: VmIndex, to: VmIndex) { + self.assert_pop(to - from); self.values.drain(from as usize..to as usize); } @@ -722,7 +729,12 @@ where }; assert!( self.len() >= count + args, - "Attempted to pop value which did not belong to the current frame" + "Attempted to pop value which did not belong to the current frame: {}", + match &*self.frame().state.to_state() { + State::Extern(ext) => ext.function.id.as_str().to_string(), + State::Closure(closure) => closure.closure.function.name.as_str().to_string(), + State::Unknown => "".to_string(), + } ); } @@ -746,7 +758,25 @@ where } pub fn clear(&mut self) { - let len = self.len(); + let args = if let State::Extern(ExternState { + locked: Some(args), .. + }) = *self.frame().state.to_state() + { + args + } else { + 0 + }; + debug_assert!( + self.len() >= args, + "Stack has popped locked elements from {}: {} < {}", + match &*self.frame().state.to_state() { + State::Extern(ext) => ext.function.id.clone(), + _ => unreachable!(), + }, + self.len(), + args + ); + let len = self.len() - args; self.stack.pop_many(len); } diff --git a/vm/src/thread.rs b/vm/src/thread.rs index 342e6b0f0f..4b38ebabbd 100644 --- a/vm/src/thread.rs +++ b/vm/src/thread.rs @@ -2,12 +2,14 @@ use std::{ any::{Any, TypeId}, cmp::Ordering, - fmt, mem, + fmt, + marker::Unpin, + mem, ops::{Add, Deref, DerefMut, Div, Mul, Sub}, + pin::Pin, ptr, result::Result as StdResult, slice, - string::String as StdString, sync::{ self, atomic::{self, AtomicBool}, @@ -17,10 +19,14 @@ use std::{ }; use futures::{ - future::{self, Either, FutureResult}, - try_ready, Async, Future, Poll, + future::{self, Either, Ready}, + ready, + task::{self, Poll}, + Future, }; +use async_trait::async_trait; + use crate::base::{ metadata::Metadata, pos::Line, @@ -36,7 +42,8 @@ use crate::{ macros::MacroEnv, source_map::LocalIter, stack::{ - ClosureState, ExternCallState, ExternState, Frame, Stack, StackFrame, StackState, State, + ClosureState, ExternCallState, ExternState, Frame, Lock, Stack, StackFrame, StackState, + State, }, types::*, value::{ @@ -47,12 +54,12 @@ use crate::{ VariantDef, }, vm::{GlobalVmState, GlobalVmStateBuilder, ThreadSlab, VmEnvInstance}, - BoxFuture, Error, Result, Variants, + Error, Result, Variants, }; pub use crate::{gc::Trace, stack::PopValue}; -pub type FutureValue = Either::Item, ::Error>, F>; +pub type FutureValue = Either::Output>, F>; pub struct Execute { thread: Option, @@ -77,26 +84,25 @@ where impl<'vm, T> Future for Execute where - T: Deref, + T: Deref + Unpin, T: VmRoot<'vm>, { - type Item = RootedValue; - type Error = Error; + type Output = Result>; // Returns `T` so that it can be reused by the caller - fn poll(&mut self) -> Poll { + fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll { let value = { let thread = self .thread .as_ref() .expect("cannot poll Execute future after it has succeded"); - let mut context = try_ready!(thread.resume()); + let mut context = ready!(thread.resume(cx))?; context.stack.pop() }; let thread = self.thread.take().unwrap(); // SAFETY `value` is produced (and owned) by `thread` - unsafe { Ok(Async::Ready(thread.root_value_with_self(&value))) } + unsafe { Poll::Ready(Ok(thread.root_value_with_self(&value))) } } } @@ -104,17 +110,15 @@ pub struct ExecuteTop(pub Execute); impl<'vm, T> Future for ExecuteTop where - T: Deref, + T: Deref + Unpin, T: VmRoot<'vm>, { - type Item = RootedValue; - type Error = Error; + type Output = Result>; // Returns `T` so that it can be reused by the caller - fn poll(&mut self) -> Poll { - match self.0.poll() { - Ok(Async::Ready(x)) => Ok(Async::Ready(x)), - Ok(Async::NotReady) => Ok(Async::NotReady), + fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll { + match ready!(Pin::new(&mut self.0).poll(cx)) { + Ok(x) => Ok(x).into(), Err(mut err) => { let thread = self .0 @@ -127,7 +131,7 @@ where if let Error::Panic(_, ref mut trace) = err { *trace = Some(new_trace); } - Err(err) + Err(err).into() } } } @@ -1054,6 +1058,7 @@ impl VmRootInternal for RootedThread { /// Internal functions for interacting with threads. These functions should be considered both /// unsafe and unstable. +#[async_trait] pub trait ThreadInternal: Sized where Self: ::std::borrow::Borrow, @@ -1067,22 +1072,19 @@ where T: VmRoot<'vm>; /// Evaluates a zero argument function (a thunk) - fn call_thunk<'vm>( - &'vm self, - closure: &GcPtr, - ) -> FutureValue>; + async fn call_thunk(&self, closure: &GcPtr) -> Result>; - fn call_thunk_top<'vm>( - &'vm self, + async fn call_thunk_top( + &self, closure: &GcPtr, - ) -> BoxFuture<'static, RootedValue, Error> + ) -> Result> where Self: Send + Sync, { let self_ = RootedThread::new_root(self.borrow()); let level = self_.context().stack.get_frames().len(); - Box::new(self.call_thunk(closure).or_else(move |mut err| { + self.call_thunk(closure).await.or_else(move |mut err| { let mut context = self_.context(); let stack = StackFrame::::current(&mut context.stack); let new_trace = reset_stack(stack, level)?; @@ -1090,22 +1092,19 @@ where *trace = Some(new_trace); } Err(err) - })) + }) } /// Executes an `IO` action - fn execute_io<'vm>(&'vm self, value: Variants) -> FutureValue>; + async fn execute_io(&self, value: Variants<'_>) -> Result>; - fn execute_io_top<'vm>( - &'vm self, - value: Variants, - ) -> BoxFuture<'static, RootedValue, Error> + async fn execute_io_top(&self, value: Variants<'_>) -> Result> where Self: Send + Sync, { let self_ = RootedThread::new_root(self.borrow()); let level = self_.context().stack.get_frames().len(); - Box::new(self.execute_io(value).or_else(move |mut err| { + self.execute_io(value).await.or_else(move |mut err| { let mut context = self_.context(); let stack = StackFrame::::current(&mut context.stack); let new_trace = reset_stack(stack, level)?; @@ -1113,7 +1112,7 @@ where *trace = Some(new_trace); } Err(err) - })) + }) } /// Calls a function on the stack. @@ -1121,11 +1120,12 @@ where /// `stack.len() - args - 1` and that the arguments are of the correct type fn call_function<'b>( &'b self, + cx: &mut task::Context<'_>, stack: OwnedContext<'b>, args: VmIndex, - ) -> Result>>>; + ) -> Poll>>>; - fn resume(&self) -> Result>; + fn resume(&self, cx: &mut task::Context<'_>) -> Poll>; fn set_global( &self, @@ -1141,6 +1141,7 @@ where fn can_share_values_with(&self, gc: &mut Gc, other: &Thread) -> bool; } +#[async_trait] impl ThreadInternal for Thread { fn context(&self) -> OwnedContext { OwnedContext { @@ -1157,52 +1158,76 @@ impl ThreadInternal for Thread { unsafe { T::new_root(self).root_value_with_self(value.get_value()) } } - fn call_thunk<'vm>( - &'vm self, - closure: &GcPtr, - ) -> FutureValue> { - let mut context = self.owned_context(); - context.stack.push(construct_gc!(Closure(@&closure))); - StackFrame::::current(&mut context.stack).enter_scope( - 0, - &*construct_gc!(ClosureState { - @closure: gc::Borrow::new(closure), - instruction_index: 0, - }), - ); - match try_future!(context.execute(), Either::A) { - Async::Ready(context) => { - let mut context = context.unwrap(); + async fn call_thunk(&self, closure: &GcPtr) -> Result> { + let mut fut = None; + future::poll_fn(|cx| match &mut fut { + None => { + let mut context = self.owned_context(); + context.stack.push(construct_gc!(Closure(@&closure))); + StackFrame::::current(&mut context.stack).enter_scope( + 0, + &*construct_gc!(ClosureState { + @closure: gc::Borrow::new(closure), + instruction_index: 0, + }), + ); + let mut context = match context.execute(cx) { + Poll::Pending => { + fut = Some(Execute::new(self.root_thread())); + return Poll::Pending; + } + Poll::Ready(Ok(context)) => { + context.expect("call_module to have the stack remaining") + } + Poll::Ready(Err(err)) => return Err(err).into(), + }; let value = self.root_value(context.stack.last().unwrap()); context.stack.pop(); - Either::A(future::ok(value)) + Ok(value).into() } - Async::NotReady => Either::B(Execute::new(self.root_thread())), - } + Some(fut) => Pin::new(fut).poll(cx), + }) + .await } /// Calls a module, allowed to to run IO expressions - fn execute_io<'vm>(&'vm self, value: Variants) -> FutureValue> { + async fn execute_io(&self, value: Variants<'_>) -> Result> { trace!("Run IO {:?}", value); - let mut context = self.context(); - // Dummy value to fill the place of the function for TailCall - context - .stack - .extend(&[Variants::int(0), value, Variants::int(0)]); - - context.borrow_mut().enter_scope(2, &State::Unknown, false); - context = match try_future!(self.call_function(context, 1), Either::A) { - Async::Ready(context) => context.expect("call_module to have the stack remaining"), - Async::NotReady => return Either::B(Execute::new(self.root_thread())), - }; - let result = self.root_value(context.stack.last().unwrap()); - context.stack.pop(); - { - let mut context = context.borrow_mut(); - context.stack.clear(); - } - let _ = context.exit_scope(); - Either::A(future::ok(result)) + + let mut fut = None; + future::poll_fn(|cx| { + match &mut fut { + None => { + let mut context = self.context(); + // Dummy value to fill the place of the function for TailCall + context + .stack + .extend(&[Variants::int(0), value.clone(), Variants::int(0)]); + + context.borrow_mut().enter_scope(2, &State::Unknown, false); + context = match self.call_function(cx, context, 1) { + Poll::Pending => { + fut = Some(Execute::new(self.root_thread())); + return Poll::Pending; + } + Poll::Ready(Ok(context)) => { + context.expect("call_module to have the stack remaining") + } + Poll::Ready(Err(err)) => return Err(err).into(), + }; + let result = self.root_value(context.stack.last().unwrap()); + context.stack.pop(); + { + let mut context = context.borrow_mut(); + context.stack.clear(); + } + let _ = context.exit_scope(); + Ok(result).into() + } + Some(fut) => Pin::new(fut).poll(cx), + } + }) + .await } /// Calls a function on the stack. @@ -1210,21 +1235,22 @@ impl ThreadInternal for Thread { /// `stack.len() - args - 1` and that the arguments are of the correct type fn call_function<'b>( &'b self, + cx: &mut task::Context<'_>, mut context: OwnedContext<'b>, args: VmIndex, - ) -> Result>>> { + ) -> Poll>>> { context.borrow_mut().do_call(args)?; - context.execute() + context.execute(cx) } - fn resume(&self) -> Result> { + fn resume(&self, cx: &mut task::Context<'_>) -> Poll> { let mut context = self.owned_context(); if context.stack.get_frames().len() == 1 { // Only the top level frame left means that the thread has finished - return Err(Error::Dead); + return Err(Error::Dead).into(); } - context = try_ready!(context.execute()).unwrap(); - Ok(Async::Ready(context)) + context = ready!(context.execute(cx))?.unwrap(); + Ok(context).into() } fn set_global( @@ -1285,16 +1311,25 @@ impl ThreadInternal for Thread { } } -pub type HookFn = Box Result> + Send + Sync>; +pub type HookFn = Box Poll> + Send + Sync>; pub struct DebugInfo<'a> { stack: &'a Stack, state: HookFlags, } -pub struct StackInfo<'a> { - info: &'a DebugInfo<'a>, - index: usize, +impl fmt::Debug for DebugInfo<'_> { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.debug_struct("DebugInfo") + .field("state", &self.state()) + .field( + "stack_infos", + &(0..self.stack_info_len()) + .map(|i| self.stack_info(i).unwrap()) + .collect::>(), + ) + .finish() + } } impl<'a> DebugInfo<'a> { @@ -1322,6 +1357,24 @@ impl<'a> DebugInfo<'a> { } } +pub struct StackInfo<'a> { + info: &'a DebugInfo<'a>, + index: usize, +} + +impl fmt::Debug for StackInfo<'_> { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.debug_struct("DebugInfo") + .field("frame", &self.frame()) + .field("line", &self.line()) + .field("source_name", &self.source_name()) + .field("function_name", &self.function_name()) + .field("locals", &self.locals().collect::>()) + .field("upvars", &self.upvars()) + .finish() + } +} + impl<'a> StackInfo<'a> { fn frame(&self) -> &Frame { &self.info.stack.get_frames()[self.index] @@ -1393,7 +1446,7 @@ impl<'a> StackInfo<'a> { pub fn upvars(&self) -> &[UpvarInfo] { match self.frame().state { State::Closure(ClosureState { ref closure, .. }) => &closure.function.debug_info.upvars, - _ => ice!("Attempted to access upvar in non closure function"), + _ => &[], } } } @@ -1416,8 +1469,17 @@ struct Hook { previous_instruction_index: usize, } +type PollFnInner<'a> = Box< + dyn for<'vm> FnMut( + &mut task::Context<'_>, + &'vm Thread, + ) -> Poll>> + + Send + + 'a, +>; + struct PollFn { - poll_fn: Box FnMut(&'vm Thread) -> super::Result>> + Send>, + poll_fn: PollFnInner<'static>, frame_index: VmIndex, } @@ -1547,24 +1609,27 @@ impl Context { /// /// This function is unsafe because the `vm` lifetime must not outlive the lifetime of the /// `Thread` - pub unsafe fn return_future<'vm, F>(&mut self, mut future: F, frame_index: VmIndex) + pub unsafe fn return_future<'vm, F>(&mut self, mut future: F, lock: Lock, frame_index: VmIndex) where - F: Future + Send + 'static, - F::Item: Pushable<'vm>, + F: Future + Send + 'vm, + F::Output: Pushable<'vm>, { + let poll_fn: PollFnInner<'_> = Box::new(move |cx: &mut task::Context<'_>, vm: &Thread| { + // `future` is moved into the closure, which is boxed and therefore pinned + let value = ready!(Pin::new_unchecked(&mut future).poll(cx)); + + let mut context = vm.current_context(); + let result = { + context.stack().release_lock(lock); + let context = + mem::transmute::<&mut ActiveThread<'_>, &mut ActiveThread<'vm>>(&mut context); + value.push(context) + }; + Poll::Ready(result.map(|()| context.into_owned())) + }); self.poll_fns.push(PollFn { frame_index, - poll_fn: Box::new(move |vm| { - let value = try_ready!(future.poll()); - - let mut context = vm.current_context(); - let result = { - let context = - mem::transmute::<&mut ActiveThread, &mut ActiveThread<'vm>>(&mut context); - value.push(context) - }; - result.map(|()| Async::Ready(context.into_owned())) - }), + poll_fn: mem::transmute::, PollFnInner<'static>>(poll_fn), }); } } @@ -1675,11 +1740,12 @@ impl<'b> OwnedContext<'b> { } } - fn execute(mut self) -> Result>>> { + fn execute(mut self, cx: &mut task::Context<'_>) -> Poll>>> { let mut context = self.borrow_mut(); + // Return when the starting frame is finished loop { if context.thread.interrupted() { - return Err(Error::Interrupted); + return Err(Error::Interrupted).into(); } trace!("STACK\n{:?}", context.stack.stack().get_frames()); let state = &context.stack.frame().state; @@ -1700,7 +1766,7 @@ impl<'b> OwnedContext<'b> { stack: &context.stack.stack(), state: HookFlags::CALL_FLAG, }; - try_ready!(hook(thread, info)) + ready!(hook(thread, info))? } } _ => (), @@ -1709,10 +1775,13 @@ impl<'b> OwnedContext<'b> { match state { State::Unknown => { - return Ok(Async::Ready(Some(self))); + return Ok(Some(self)).into(); } - State::Extern(ext) if ext.is_locked() => { - return Ok(Async::Ready(Some(self))); + + State::Extern(ext) if ext.is_locked() && context.poll_fns.is_empty() => { + // The frame is locked and there is no futures to poll => The owner of the + // frame is up the call stack so we should return and let them handle it. + return Ok(Some(self)).into(); } State::Extern(ext) => { @@ -1720,7 +1789,7 @@ impl<'b> OwnedContext<'b> { // We are currently in the poll call of this extern function. // Return control to the caller. if ext.call_state == ExternCallState::InPoll { - return Ok(Async::Ready(Some(self))); + return Ok(Some(self)).into(); } if ext.call_state == ExternCallState::Poll { if let Some(frame_index) = context.poll_fns.last().map(|f| f.frame_index) { @@ -1737,7 +1806,7 @@ impl<'b> OwnedContext<'b> { _ => unreachable!(), } - self = try_ready!(self.execute_function(ext.call_state, &ext.function)); + self = ready!(self.execute_function(cx, ext.call_state, &ext.function))?; context = self.borrow_mut(); } @@ -1753,11 +1822,11 @@ impl<'b> OwnedContext<'b> { if instruction_index == 0 && context.stack.stack().len() + function_size > max_stack_size { - return Err(Error::StackOverflow(max_stack_size)); + return Err(Error::StackOverflow(max_stack_size)).into(); } if context.stack.stack().get_frames().len() == 0 { - return Ok(Async::Ready(Some(self))); + return Ok(Some(self)).into(); } else { debug!( "Continue with {}\nAt: {}/{}\n{:?}", @@ -1768,9 +1837,9 @@ impl<'b> OwnedContext<'b> { ); let closure_context = context.from_state(); - match try_ready!(closure_context.execute_()) { + match ready!(closure_context.execute_())? { Some(new_context) => context = new_context, - None => return Ok(None.into()), + None => return Ok(None).into(), } } } @@ -1780,9 +1849,10 @@ impl<'b> OwnedContext<'b> { fn execute_function( mut self, + cx: &mut task::Context<'_>, call_state: ExternCallState, function: &ExternFunction, - ) -> Result>> { + ) -> Poll>> { debug!( "CALL EXTERN {} {:?} {} {:?}", function.id, @@ -1801,7 +1871,7 @@ impl<'b> OwnedContext<'b> { status = (function.function)(thread); if status == Status::Yield { - return Ok(Async::NotReady); + return Poll::Pending; } self = thread.owned_context(); @@ -1809,19 +1879,20 @@ impl<'b> OwnedContext<'b> { if status == Status::Error { return match self.stack.pop().get_repr() { String(s) => { - Err(Error::Panic(s.to_string(), Some(self.stack.stacktrace(0)))) + Err(Error::Panic(s.to_string(), Some(self.stack.stacktrace(0)))).into() } _ => Err(Error::Message(format!( "Unexpected error calling function `{}`", function.id - ))), + ))) + .into(), }; } // The `poll_fn` at the top may be for a stack frame at a lower level, return to the // state loop to ensure that we are executing the frame at the top of the stack if !self.poll_fns.is_empty() { - return Ok(Async::Ready(self)); + return Ok(self).into(); } } @@ -1837,12 +1908,12 @@ impl<'b> OwnedContext<'b> { drop(self); // Poll the future that was returned from the initial call to this extern function debug!("POLL EXTERN {}", function.id); - match (poll_fn.poll_fn)(thread) { - Ok(Async::Ready(context)) => { + match (poll_fn.poll_fn)(cx, thread) { + Poll::Ready(Ok(context)) => { debug!("READY EXTERN {}", function.id); self = context; } - Ok(Async::NotReady) => { + Poll::Pending => { debug!("NOT READY EXTERN {}", function.id); self = thread.owned_context(); match self.stack.get_frames_mut()[frame_offset].state { @@ -1851,9 +1922,9 @@ impl<'b> OwnedContext<'b> { } // Restore `poll_fn` so it can be polled again self.poll_fns.push(poll_fn); - return Ok(Async::NotReady); + return Poll::Pending; } - Err(err) => return Err(err), + Poll::Ready(Err(err)) => return Err(err).into(), } } } @@ -1866,10 +1937,6 @@ impl<'b> OwnedContext<'b> { let result = self.stack.pop(); { let mut stack = self.stack.current_frame(); - while stack.len() > 0 { - trace!("{} {:?}", stack.len(), &*stack); - stack.pop(); - } debug_assert!( match stack.frame().state { State::Extern(ref e) => e.function.id == function.id, @@ -1878,10 +1945,15 @@ impl<'b> OwnedContext<'b> { "Attempted to pop {:?} but {} was expected", stack.frame(), function.id - ) + ); + + stack.clear(); } self = self.exit_scope().map_err(|_| { - Error::Message(StdString::from("Poped the last frame in execute_function")) + Error::Message(format!( + "Popped the last frame or a locked frame in execute_function: {}", + function.id + )) })?; self.stack.pop(); // Pop function self.stack.push(result); @@ -1893,14 +1965,17 @@ impl<'b> OwnedContext<'b> { ); match status { - Status::Ok => Ok(Async::Ready(self)), - Status::Yield => Ok(Async::NotReady), + Status::Ok => Ok(self).into(), + Status::Yield => Poll::Pending, Status::Error => match self.stack.pop().get_repr() { - String(s) => Err(Error::Panic(s.to_string(), Some(self.stack.stacktrace(0)))), + String(s) => { + Err(Error::Panic(s.to_string(), Some(self.stack.stacktrace(0)))).into() + } _ => Err(Error::Message(format!( "Unexpected error calling function `{}`", function.id - ))), + ))) + .into(), }, } } @@ -2017,7 +2092,7 @@ where } impl<'b, 'gc> ExecuteContext<'b, 'gc> { - fn execute_(mut self) -> Result>>> { + fn execute_(mut self) -> Poll>>> { let state = &self.stack.frame().state; let function = unsafe { state.closure.function.clone_unrooted() }; { @@ -2041,7 +2116,7 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { debug_instruction(&self.stack, instruction_index, instr); if self.hook.flags.contains(HookFlags::LINE_FLAG) { - try_ready!(self.run_hook(&function, instruction_index)); + ready!(self.run_hook(&function, instruction_index))?; } match instr { @@ -2052,7 +2127,8 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { return Err(Error::Panic( format!("ICE: Stack push out of bounds in {}", function.name), Some(self.stack.stack().stacktrace(0)), - )); + )) + .into(); } }; self.stack.push(v); @@ -2072,7 +2148,7 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { Call(args) => { self.stack .set_instruction_index(program_counter.instruction_index); - return self.do_call(args).map(|x| Async::Ready(Some(x))); + return self.do_call(args).map(Some).into(); } TailCall(mut args) => { let mut amount = self.stack.len() - args; @@ -2104,7 +2180,7 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { let end = context.stack.len() - args - 1; context.stack.remove_range(end - amount, end); trace!("{:?}", &context.stack[..]); - return context.do_call(args).map(|x| Async::Ready(Some(x))); + return context.do_call(args).map(Some).into(); } ConstructVariant { tag, args } => { let d = { @@ -2240,7 +2316,7 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { let v = &data.fields[i as usize]; self.stack.push(v); } - x => return Err(Error::Message(format!("GetOffset on {:?}", x))), + x => return Err(Error::Message(format!("GetOffset on {:?}", x))).into(), }, GetField(i) => { let field = &function.strings[i as usize]; @@ -2253,7 +2329,7 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { self.stack.push(v); } x => { - return Err(Error::Message(format!("GetField on {:?}", x))); + return Err(Error::Message(format!("GetField on {:?}", x))).into(); } } } @@ -2264,7 +2340,8 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { _ => { return Err(Error::Message( "Op TestTag called on non data type".to_string(), - )); + )) + .into(); } }; self.stack @@ -2277,7 +2354,8 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { _ => { return Err(Error::Message( "Op TestTag called on non data type".to_string(), - )); + )) + .into(); } }; debug_assert!( @@ -2303,7 +2381,8 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { _ => { return Err(Error::Message( "Op Split called on non data type".to_string(), - )); + )) + .into(); } } } @@ -2441,22 +2520,16 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { context.stack.slide(1); context.stack.extend(&excess.fields); let excess_fields_len = excess.fields.len() as VmIndex; - context - .do_call(excess_fields_len) - .map(|x| Async::Ready(Some(x))) + Poll::Ready(context.do_call(excess_fields_len).map(|x| Some(x))) } x => ice!("Expected excess arguments found {:?}", x), } } else { - Ok(Async::Ready(if stack_exists { - Some(context) - } else { - None - })) + Poll::Ready(Ok(if stack_exists { Some(context) } else { None })) } } - fn run_hook(&mut self, function: &BytecodeFunction, index: usize) -> Result> { + fn run_hook(&mut self, function: &BytecodeFunction, index: usize) -> Poll> { if let Some(ref mut hook) = self.hook.function { let current_line = function.debug_info.source_map.line(index); let previous_line = function @@ -2470,10 +2543,10 @@ impl<'b, 'gc> ExecuteContext<'b, 'gc> { stack: &self.stack.stack(), state: HookFlags::LINE_FLAG, }; - try_ready!(hook(self.thread, info)) + ready!(hook(self.thread, info))? } } - Ok(().into()) + Ok(()).into() } } @@ -2846,15 +2919,15 @@ impl<'vm> ActiveThread<'vm> { &mut self.context.as_mut().unwrap().stack } - pub unsafe fn return_future(&mut self, future: F, frame_index: VmIndex) + pub unsafe fn return_future(&mut self, future: F, lock: Lock, frame_index: VmIndex) where - F: Future + Send + 'static, - F::Item: Pushable<'vm>, + F: Future + Send + 'vm, + F::Output: Pushable<'vm>, { self.context .as_mut() .expect("context") - .return_future(future, frame_index) + .return_future(future, lock, frame_index) } } #[doc(hidden)] diff --git a/vm/src/vm.rs b/vm/src/vm.rs index 6fda0fe339..6e62203b02 100644 --- a/vm/src/vm.rs +++ b/vm/src/vm.rs @@ -2,7 +2,7 @@ use std::{ any::{Any, TypeId}, result::Result as StdResult, string::String as StdString, - sync::{self, atomic::AtomicUsize, Arc, Mutex, RwLock, RwLockReadGuard}, + sync::{atomic::AtomicUsize, Arc, Mutex, RwLock}, usize, }; @@ -200,8 +200,11 @@ where serde(serialize_state = "crate::serialization::SeSeed") )] pub struct GlobalVmState { - #[cfg_attr(feature = "serde_derive", serde(state))] - env: RwLock, + #[cfg_attr( + feature = "serde_derive", + serde(state_with = "crate::serialization::rw_lock") + )] + env: parking_lot::RwLock, #[cfg_attr( feature = "serde_derive", serde(state_with = "crate::serialization::borrow") @@ -243,7 +246,7 @@ pub struct GlobalVmState { unsafe impl Trace for GlobalVmState { unsafe fn root(&mut self) { - for g in self.env.get_mut().unwrap().globals.values_mut() { + for g in self.env.get_mut().globals.values_mut() { g.root(); } @@ -254,7 +257,7 @@ unsafe impl Trace for GlobalVmState { self.generation_0_threads.get_mut().unwrap().root(); } unsafe fn unroot(&mut self) { - for g in self.env.get_mut().unwrap().globals.values_mut() { + for g in self.env.get_mut().globals.values_mut() { g.unroot(); } @@ -266,7 +269,7 @@ unsafe impl Trace for GlobalVmState { } fn trace(&self, gc: &mut Gc) { - for g in self.env.read().unwrap().globals.values() { + for g in self.env.read().globals.values() { g.trace(gc); } @@ -311,7 +314,7 @@ pub trait VmEnv: pub struct VmEnvInstance<'a> { // FIXME Use the database stored here for lookups vm_envs: Vec>, - globals: RwLockReadGuard<'a, Globals>, + globals: parking_lot::RwLockReadGuard<'a, Globals>, thread: &'a Thread, } @@ -407,9 +410,6 @@ impl<'a> MetadataEnv for VmEnvInstance<'a> { impl<'a> VmEnv for VmEnvInstance<'a> { fn get_global(&self, name: &str) -> Option { - if name.contains("+") { - 123.to_string(); - } self.vm_envs .iter() .filter_map(|env| env.get_global(name)) @@ -577,7 +577,7 @@ impl GlobalVmState { } fn add_type(self_: &mut GlobalVmState, name: &str, typ: ArcType, id: TypeId) { let ids = self_.typeids.get_mut().unwrap(); - let env = self_.env.get_mut().unwrap(); + let env = self_.env.get_mut(); ids.insert(id, typ); // Insert aliases so that `find_info` can retrieve information about the primitives env.type_infos.id_to_type.insert( @@ -618,9 +618,9 @@ impl GlobalVmState { thread: &Thread, f: CompiledModule, ) -> Result>> { + let mut gc = self.gc.lock().unwrap(); let env = self.get_env(thread); let mut interner = self.interner.write().unwrap(); - let mut gc = self.gc.lock().unwrap(); let byte_code = new_bytecode(&env, &mut interner, &mut gc, self, f)?; Ok(OpaqueValue::from_value( thread.root_value(Variants::from(byte_code)), @@ -634,7 +634,7 @@ impl GlobalVmState { /// Checks if a global exists called `name` pub fn global_exists(&self, name: &str) -> bool { - self.env.read().unwrap().globals.get(name).is_some() + self.env.read_recursive().globals.get(name).is_some() } pub(crate) fn set_global( @@ -646,7 +646,7 @@ impl GlobalVmState { ) -> Result<()> { assert!(value.generation().is_root()); assert!(id.is_global(), "Symbol is not global"); - let mut env = self.env.write().unwrap(); + let mut env = self.env.write(); let globals = &mut env.globals; let global = Global { id: id.clone(), @@ -705,7 +705,7 @@ impl GlobalVmState { alias: Alias, id: TypeId, ) -> Result { - let mut env = self.env.write().unwrap(); + let mut env = self.env.write(); let type_infos = &mut env.type_infos; if type_infos.id_to_type.contains_key(name.definition_name()) { Err(Error::TypeAlreadyExists(name.definition_name().into())) @@ -723,7 +723,7 @@ impl GlobalVmState { } pub fn cache_alias(&self, alias: Alias) -> ArcType { - let mut env = self.env.write().unwrap(); + let mut env = self.env.write(); let type_infos = &mut env.type_infos; let t = alias.clone().into_type(); type_infos @@ -737,8 +737,8 @@ impl GlobalVmState { } pub fn intern(&self, s: &str) -> Result { - let mut interner = self.interner.write().unwrap(); let mut gc = self.gc.lock().unwrap(); + let mut interner = self.interner.write().unwrap(); interner.intern(&mut *gc, s) } @@ -747,7 +747,7 @@ impl GlobalVmState { let capabilities = self.macros.get_capabilities::>(thread); VmEnvInstance { vm_envs: capabilities, - globals: self.env.read().unwrap(), + globals: self.env.read_recursive(), thread, } } @@ -763,14 +763,14 @@ impl GlobalVmState { pub fn get_lookup_env<'t>(&'t self, thread: &'t Thread) -> VmEnvInstance<'t> { VmEnvInstance { vm_envs: Vec::new(), - globals: self.env.read().unwrap(), + globals: self.env.read_recursive(), thread, } } #[doc(hidden)] - pub fn get_globals(&self) -> sync::RwLockReadGuard { - self.env.read().unwrap() + pub fn get_globals(&self) -> parking_lot::RwLockReadGuard { + self.env.read_recursive() } pub fn get_debug_level(&self) -> DebugLevel {