Timely fix fixes everything

vmware · Apr 10, 2021 · f3f0524 · f3f0524
1 parent 7766877
commit f3f0524
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/rust/template/Cargo.toml b/rust/template/Cargo.toml
@@ -14,29 +14,15 @@ command-line = ["cmd_parser", "rustop"]
 nested_ts_32 = ["differential_datalog/nested_ts_32"]
 c_api = ["differential_datalog/c_api"]
 
-[target.'cfg(not(windows))'.build-dependencies]
-libtool = "0.1"
-
-[dependencies.differential_datalog]
-path = "./differential_datalog"
-
-[dependencies.cmd_parser]
-path = "./cmd_parser"
-optional = true
-
-[dependencies.ddlog_ovsdb_adapter]
-path = "./ovsdb"
-optional = true
-
 [dependencies]
 abomonation = "0.7"
 time = { version = "0.2", features = ["serde"] }
 ordered-float = { version = "2.0.0", features = ["serde"] }
 cpuprofiler = { version = "0.0", optional = true }
 #differential-dataflow = "0.11.0"
-differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-3" }
+differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-4" }
 #timely = "0.11"
-timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-3", default-features = false }
+timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-4", default-features = false }
 fnv = "1.0.2"
 once_cell = "1.4.1"
 libc = "0.2"
@@ -53,6 +39,20 @@ enum-primitive-derive = "0.2.1"
 # libraries: flatbuffers "0.6" <-> FlatBuffers "1.11.0".
 flatbuffers = { version = "0.6", optional = true }
 
+[dependencies.differential_datalog]
+path = "./differential_datalog"
+
+[dependencies.cmd_parser]
+path = "./cmd_parser"
+optional = true
+
+[dependencies.ddlog_ovsdb_adapter]
+path = "./ovsdb"
+optional = true
+
+[target.'cfg(not(windows))'.build-dependencies]
+libtool = "0.1"
+
 [[bin]]
 name = "datalog_example_cli"
 path = "src/main.rs"

diff --git a/rust/template/differential_datalog/Cargo.toml b/rust/template/differential_datalog/Cargo.toml
@@ -12,10 +12,10 @@ c_api = []
 
 [dependencies]
 #differential-dataflow = "0.11.0"
-differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-3" }
-dogsdogsdogs = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-3" }
+differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-4" }
+dogsdogsdogs = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-4" }
 #timely = "0.11"
-timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-3", default-features = false }
+timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-4", default-features = false }
 
 abomonation = "0.7"
 ordered-float = { version = "2.0.0", features = ["serde"] }

diff --git a/rust/template/differential_datalog_test/Cargo.toml b/rust/template/differential_datalog_test/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2018"
 
 [dependencies]
 # differential-dataflow = "0.11.0"
-differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-3" }
+differential-dataflow = { git = "https://github.com/ddlog-dev/differential-dataflow", branch = "ddlog-4" }
 abomonation = "0.7"
 fnv = "1.0.2"
 # timely = "0.11"
-timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-3" }
+timely = { git = "https://github.com/ddlog-dev/timely-dataflow", branch = "ddlog-4" }
 serde = { version = "1.0", features = ["derive"] }
 erased-serde = "0.3"
 differential_datalog = { path = "../differential_datalog" }

diff --git a/src/Language/DifferentialDatalog/Compile.hs b/src/Language/DifferentialDatalog/Compile.hs
@@ -770,8 +770,8 @@ mkCargoToml rs_code crate crate_id =
            "erased-serde = \"0.3\""                                                        $$
            --"differential-dataflow = \"0.11.0\""                                            $$
            --"timely = \"0.11\""                                                             $$
-           "differential-dataflow = { git = \"https://github.com/ddlog-dev/differential-dataflow\", branch = \"ddlog-3\" }" $$
-           "timely = { git = \"https://github.com/ddlog-dev/timely-dataflow\", branch = \"ddlog-3\",  default-features = false }"  $$
+           "differential-dataflow = { git = \"https://github.com/ddlog-dev/differential-dataflow\", branch = \"ddlog-4\" }" $$
+           "timely = { git = \"https://github.com/ddlog-dev/timely-dataflow\", branch = \"ddlog-4\",  default-features = false }"  $$
            ""                                                                              $$
            dependencies                                                                    $$
            ""                                                                              $$