Bring differential to Rust 2021 (#443)

What started as a simple change to visibility .. went sideways. Signed-off-by: Moritz Hoffmann <[email protected]>
TimelyDataflow · Dec 7, 2023 · d9d4db6 · d9d4db6
1 parent 008680f
commit d9d4db6
Show file tree

Hide file tree

Showing 123 changed files with 348 additions and 753 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,29 +13,45 @@ repository = "https://github.com/TimelyDataflow/differential-dataflow.git"
 keywords = ["differential", "dataflow"]
 license = "MIT"
 readme = "README.md"
+edition="2021"
 
 [workspace]
-members = [".", "dogsdogsdogs"]
+members = [
+    ".",
+    # "advent_of_code_2017",
+    "dogsdogsdogs",
+    "experiments",
+    "interactive",
+    "server",
+    "server/dataflows/degr_dist",
+    "server/dataflows/neighborhood",
+    "server/dataflows/random_graph",
+    "server/dataflows/reachability",
+    #"tpchlike",
+    "doop"
+]
 
 [dev-dependencies]
 bincode = "1.3.1"
 rdkafka = "0.24"
-indexmap = "1.0.1"
+indexmap = "2.1"
 rand="0.4"
 byteorder="1"
 itertools="^0.7"
 serde_json = "1.0"
 graph_map = "0.1"
 
 [dependencies]
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 abomonation = "0.7"
 abomonation_derive = "0.5"
+fnv="1.0.2"
+timely = {workspace = true}
+
+[workspace.dependencies]
 #timely = { version = "0.12", default-features = false }
 timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false }
 #timely = { path = "../timely-dataflow/timely/", default-features = false }
-fnv="1.0.2"
 
 [features]
 default = ["timely/getopts"]

diff --git a/benches/sort-bench.rs b/benches/sort-bench.rs
@@ -2,10 +2,6 @@
 // #![feature(test)]
 // #![feature(collections)]
 //
-// extern crate differential_dataflow;
-// extern crate rand;
-// extern crate test;
-//
 // use rand::{Rng, SeedableRng, StdRng, Rand};
 // use test::Bencher;
 //

diff --git a/dogsdogsdogs/Cargo.toml b/dogsdogsdogs/Cargo.toml
@@ -3,11 +3,12 @@ name = "dogsdogsdogs"
 version = "0.1.0"
 authors = ["Frank McSherry <[email protected]>"]
 license = "MIT"
+edition = "2021"
 
 [dependencies]
 abomonation = "0.7"
 abomonation_derive = "0.5"
-timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false }
+timely = { workspace = true }
 differential-dataflow = { path = "../", default-features = false }
 serde = "1"
 serde_derive = "1"

diff --git a/dogsdogsdogs/examples/delta_query.rs b/dogsdogsdogs/examples/delta_query.rs
@@ -1,9 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
-extern crate dogsdogsdogs;
-
 use timely::dataflow::Scope;
 use timely::dataflow::operators::probe::Handle;
 use differential_dataflow::input::Input;

diff --git a/dogsdogsdogs/examples/delta_query2.rs b/dogsdogsdogs/examples/delta_query2.rs
@@ -1,9 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
-extern crate dogsdogsdogs;
-
 use timely::dataflow::Scope;
 use timely::order::Product;
 use timely::dataflow::operators::probe::Handle;

diff --git a/dogsdogsdogs/examples/delta_query_wcoj.rs b/dogsdogsdogs/examples/delta_query_wcoj.rs
@@ -1,9 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
-extern crate dogsdogsdogs;
-
 use timely::dataflow::Scope;
 use timely::dataflow::operators::probe::Handle;
 use differential_dataflow::input::Input;

diff --git a/dogsdogsdogs/examples/dogsdogsdogs.rs b/dogsdogsdogs/examples/dogsdogsdogs.rs
@@ -1,9 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
-extern crate dogsdogsdogs;
-
 use timely::dataflow::operators::{ToStream, Partition, Accumulate, Inspect, Probe};
 use timely::dataflow::operators::probe::Handle;
 use differential_dataflow::{Collection, AsCollection};

diff --git a/dogsdogsdogs/examples/ngo.rs b/dogsdogsdogs/examples/ngo.rs
@@ -1,7 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
 use std::hash::Hash;
 use timely::dataflow::*;
 use timely::dataflow::operators::*;

diff --git a/dogsdogsdogs/src/altneu.rs b/dogsdogsdogs/src/altneu.rs
@@ -11,7 +11,8 @@
 //! element of the second lattice, if neither first element equals
 //! the join.
 
-
+use abomonation_derive::Abomonation;
+use serde_derive::{Deserialize, Serialize};
 
 /// A pair of timestamps, partially ordered by the product order.
 #[derive(Debug, Hash, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Abomonation, Serialize, Deserialize)]

diff --git a/dogsdogsdogs/src/lib.rs b/dogsdogsdogs/src/lib.rs
@@ -1,12 +1,3 @@
-#[macro_use]
-extern crate abomonation_derive;
-extern crate abomonation;
-extern crate timely;
-extern crate differential_dataflow;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde;
-
 use std::hash::Hash;
 
 use timely::dataflow::Scope;

diff --git a/doop/Cargo.toml b/doop/Cargo.toml
@@ -2,8 +2,9 @@
 name = "doop"
 version = "0.1.0"
 authors = ["Frank McSherry <[email protected]>"]
+edition = "2021"
 
 [dependencies]
-indexmap = "1.0.1"
-timely = { git = "https://github.com/TimelyDataflow/timely-dataflow" }
+indexmap = "2.1"
+timely = {workspace = true}
 differential-dataflow = { path = "../" }
diff --git a/doop/src/main.rs b/doop/src/main.rs
@@ -1,10 +1,5 @@
 #![allow(non_snake_case)]
 
-extern crate indexmap;
-extern crate timely;
-extern crate differential_dataflow;
-
-
 use std::collections::HashMap;
 use std::rc::Rc;
 use std::cell::RefCell;
@@ -17,7 +12,7 @@ use differential_dataflow::ExchangeData as Data;
 use differential_dataflow::lattice::Lattice;
 use differential_dataflow::input::Input;
 use differential_dataflow::operators::iterate::Variable;
-use differential_dataflow::operators::{Threshold, Join, JoinCore, Consolidate};
+use differential_dataflow::operators::{Threshold, Join, JoinCore};
 use differential_dataflow::operators::arrange::ArrangeByKey;
 
 // Type aliases for differential execution.

diff --git a/examples/accumulate.rs b/examples/accumulate.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use differential_dataflow::input::Input;

diff --git a/examples/arrange.rs b/examples/arrange.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use timely::dataflow::operators::*;

diff --git a/examples/bfs.rs b/examples/bfs.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use timely::dataflow::*;

diff --git a/examples/capture-test.rs b/examples/capture-test.rs
@@ -1,10 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
-extern crate serde;
-extern crate rdkafka;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use timely::dataflow::*;

diff --git a/examples/compact.rs b/examples/compact.rs
@@ -1,6 +1,3 @@
-extern crate timely;
-extern crate differential_dataflow;
-
 use differential_dataflow::input::Input;
 use differential_dataflow::operators::Threshold;
 

diff --git a/examples/cursors.rs b/examples/cursors.rs
@@ -31,9 +31,6 @@
 //! Final graph: {(2, 1): 1, (3, 2): 1, (3, 4): 1, (4, 3): 1}
 //! ```
 
-extern crate differential_dataflow;
-extern crate timely;
-
 use std::fmt::Debug;
 use std::collections::BTreeMap;
 

diff --git a/examples/degrees.rs b/examples/degrees.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use differential_dataflow::input::Input;

diff --git a/examples/dynamic.rs b/examples/dynamic.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use timely::dataflow::*;

diff --git a/examples/freeze.rs b/examples/freeze.rs
@@ -1,6 +1,3 @@
-extern crate timely;
-extern crate differential_dataflow;
-
 use timely::dataflow::operators::probe::Handle;
 use timely::dataflow::operators::Map;
 

diff --git a/examples/graspan.rs b/examples/graspan.rs
@@ -1,7 +1,3 @@
-extern crate indexmap;
-extern crate timely;
-extern crate differential_dataflow;
-
 use std::io::{BufRead, BufReader};
 use std::fs::File;
 

diff --git a/examples/hello.rs b/examples/hello.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use rand::{Rng, SeedableRng, StdRng};
 
 use differential_dataflow::input::Input;

diff --git a/examples/interpreted.rs b/examples/interpreted.rs
@@ -1,7 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
 use std::hash::Hash;
 use timely::dataflow::*;
 use timely::dataflow::operators::*;

diff --git a/examples/itembased_cf.rs b/examples/itembased_cf.rs
@@ -1,7 +1,3 @@
-extern crate timely;
-extern crate differential_dataflow;
-extern crate rand;
-
 use differential_dataflow::input::InputSession;
 use differential_dataflow::operators::{Join,CountTotal,Count};
 use differential_dataflow::operators::arrange::ArrangeByKey;

diff --git a/examples/monoid-bfs.rs b/examples/monoid-bfs.rs
@@ -1,16 +1,6 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
-#[macro_use]
-extern crate abomonation_derive;
-extern crate abomonation;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde;
-
-
+use abomonation_derive::Abomonation;
 use rand::{Rng, SeedableRng, StdRng};
+use serde::{Deserialize, Serialize};
 
 use timely::dataflow::*;
 use timely::dataflow::operators::probe::Handle;

diff --git a/examples/multitemporal.rs b/examples/multitemporal.rs
@@ -1,11 +1,3 @@
-#[macro_use]
-extern crate abomonation_derive;
-extern crate abomonation;
-
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use std::io::BufRead;
 
 use timely::dataflow::ProbeHandle;
@@ -144,7 +136,7 @@ fn main() {
 mod pair {
 
     /// A pair of timestamps, partially ordered by the product order.
-    #[derive(Hash, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Abomonation)]
+    #[derive(Hash, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Abomonation, Serialize, Deserialize)]
     pub struct Pair<S, T> {
         pub first: S,
         pub second: T,
@@ -211,6 +203,8 @@ mod pair {
     }
 
     use std::fmt::{Formatter, Error, Debug};
+    use abomonation_derive::Abomonation;
+    use serde::{Deserialize, Serialize};
 
     /// Debug implementation to avoid seeing fully qualified path names.
     impl<TOuter: Debug, TInner: Debug> Debug for Pair<TOuter, TInner> {
@@ -227,9 +221,11 @@ mod pair {
 /// from the rest of the library other than the traits it needs to implement. With this
 /// type and its implementations, you can use it as a timestamp type.
 mod vector {
+    use abomonation_derive::Abomonation;
+    use serde::{Deserialize, Serialize};
 
     /// A pair of timestamps, partially ordered by the product order.
-    #[derive(Hash, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Abomonation, Debug)]
+    #[derive(Hash, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Abomonation, Debug, Serialize, Deserialize)]
     pub struct Vector<T> {
         pub vector: Vec<T>,
     }

diff --git a/examples/pagerank.rs b/examples/pagerank.rs
@@ -1,7 +1,3 @@
-extern crate timely;
-extern crate graph_map;
-extern crate differential_dataflow;
-
 use timely::order::Product;
 use timely::dataflow::{*, operators::Filter};
 

diff --git a/examples/progress.rs b/examples/progress.rs
@@ -1,8 +1,5 @@
 //! A demonstration of timely dataflow progress tracking, using differential dataflow operators.
 
-extern crate timely;
-extern crate differential_dataflow;
-
 use timely::PartialOrder;
 use timely::dataflow::*;
 use timely::dataflow::operators::probe::Handle;

diff --git a/examples/projekt.rs b/examples/projekt.rs
@@ -1,7 +1,3 @@
-extern crate rand;
-extern crate timely;
-extern crate differential_dataflow;
-
 use timely::dataflow::operators::probe::Handle;
 
 use differential_dataflow::input::InputSession;

diff --git a/examples/spines.rs b/examples/spines.rs
@@ -1,6 +1,3 @@
-extern crate timely;
-extern crate differential_dataflow;
-
 use timely::dataflow::operators::probe::Handle;
 
 use differential_dataflow::input::Input;

diff --git a/examples/stackoverflow.rs b/examples/stackoverflow.rs
@@ -1,6 +1,3 @@
-extern crate timely;
-extern crate differential_dataflow;
-
 use std::io::{BufRead, BufReader};
 use std::fs::File;