diff --git a/Cargo.lock b/Cargo.lock index dca265b02ae84..7eb9efe1194fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -488,6 +488,14 @@ dependencies = [ "cc", ] +[[package]] +name = "columnation" +version = "0.1.0" +source = "git+https://github.com/frankmcsherry/columnation#4c5f5e9470fda0e9c9931817b5e47748cc14a5a4" +dependencies = [ + "paste 1.0.9", +] + [[package]] name = "compile-time-run" version = "0.2.11" @@ -853,8 +861,8 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "differential-dataflow" -version = "0.11.0" -source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#2b12f29d951b60c6c1ef3db77fbba1568db5a2c3" +version = "0.12.0" +source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#93da9134f7b440beef329216e434ea974619ac38" dependencies = [ "abomonation", "abomonation_derive", @@ -862,7 +870,6 @@ dependencies = [ "serde", "serde_derive", "timely", - "timely_sort", ] [[package]] @@ -904,7 +911,7 @@ checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" [[package]] name = "dogsdogsdogs" version = "0.1.0" -source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#2b12f29d951b60c6c1ef3db77fbba1568db5a2c3" +source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#93da9134f7b440beef329216e434ea974619ac38" dependencies = [ "abomonation", "abomonation_derive", @@ -912,7 +919,6 @@ dependencies = [ "serde", "serde_derive", "timely", - "timely_sort", ] [[package]] @@ -1737,7 +1743,7 @@ checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7" dependencies = [ "jemalloc-sys", "libc", - "paste", + "paste 0.1.18", ] [[package]] @@ -2504,6 +2510,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + [[package]] name = "paste-impl" version = "0.1.18" @@ -4252,29 +4264,31 @@ dependencies = [ [[package]] name = "timely" -version = "0.11.1" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#a5ca77655247dd2be5ee49eb9d89aabfcfa2402f" +version = "0.12.0" +source = "git+https://github.com/TimelyDataflow/timely-dataflow#157b80dead4f943a2ee6548eb2245787fbe9c5bd" dependencies = [ "abomonation", "abomonation_derive", "crossbeam-channel", + "futures-util", "getopts", "serde", "serde_derive", "timely_bytes", "timely_communication", + "timely_container", "timely_logging", ] [[package]] name = "timely_bytes" -version = "0.11.0" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#a5ca77655247dd2be5ee49eb9d89aabfcfa2402f" +version = "0.12.0" +source = "git+https://github.com/TimelyDataflow/timely-dataflow#157b80dead4f943a2ee6548eb2245787fbe9c5bd" [[package]] name = "timely_communication" -version = "0.11.1" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#a5ca77655247dd2be5ee49eb9d89aabfcfa2402f" +version = "0.12.0" +source = "git+https://github.com/TimelyDataflow/timely-dataflow#157b80dead4f943a2ee6548eb2245787fbe9c5bd" dependencies = [ "abomonation", "abomonation_derive", @@ -4288,15 +4302,18 @@ dependencies = [ ] [[package]] -name = "timely_logging" -version = "0.11.1" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#a5ca77655247dd2be5ee49eb9d89aabfcfa2402f" +name = "timely_container" +version = "0.12.0" +source = "git+https://github.com/TimelyDataflow/timely-dataflow#157b80dead4f943a2ee6548eb2245787fbe9c5bd" +dependencies = [ + "columnation", + "serde", +] [[package]] -name = "timely_sort" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e4b497ab85f6e09ea309d696342d198e444e93a4a55500bf3b0c3c53bdd4b3" +name = "timely_logging" +version = "0.12.0" +source = "git+https://github.com/TimelyDataflow/timely-dataflow#157b80dead4f943a2ee6548eb2245787fbe9c5bd" [[package]] name = "tinytemplate"