From a9b8241106c67860967f3827a700c2770f4b22e2 Mon Sep 17 00:00:00 2001 From: Moritz Hoffmann Date: Wed, 8 Dec 2021 13:32:21 +0100 Subject: [PATCH] Add dogs^3 to workspace and silence warnings Signed-off-by: Moritz Hoffmann --- Cargo.toml | 3 +++ dogsdogsdogs/src/lib.rs | 6 +++--- dogsdogsdogs/src/operators/half_join.rs | 2 +- src/algorithms/graphs/sequential.rs | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0fea6a11c..220eacef6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,9 @@ keywords = ["differential", "dataflow"] license = "MIT" readme = "README.md" +[workspace] +members = [".", "dogsdogsdogs"] + [dev-dependencies] bincode = "1.3.1" rdkafka = "0.24" diff --git a/dogsdogsdogs/src/lib.rs b/dogsdogsdogs/src/lib.rs index f491ff083..3e288c3d1 100644 --- a/dogsdogsdogs/src/lib.rs +++ b/dogsdogsdogs/src/lib.rs @@ -37,11 +37,11 @@ pub trait PrefixExtender> { /// The type to be produced as extension. type Extension; /// Annotates prefixes with the number of extensions the relation would propose. - fn count(&mut self, &Collection, usize) -> Collection; + fn count(&mut self, prefixes: &Collection, index: usize) -> Collection; /// Extends each prefix with corresponding extensions. - fn propose(&mut self, &Collection) -> Collection; + fn propose(&mut self, prefixes: &Collection) -> Collection; /// Restricts proposed extensions by those the extender would have proposed. - fn validate(&mut self, &Collection) -> Collection; + fn validate(&mut self, extensions: &Collection) -> Collection; } pub trait ProposeExtensionMethod> { diff --git a/dogsdogsdogs/src/operators/half_join.rs b/dogsdogsdogs/src/operators/half_join.rs index 94c5bda33..8f6f4d0cf 100644 --- a/dogsdogsdogs/src/operators/half_join.rs +++ b/dogsdogsdogs/src/operators/half_join.rs @@ -95,7 +95,7 @@ where let dout = (output_func(k, v1, v2), time.clone()); Some((dout, initial.clone(), diff)) }; - half_join_internal_unsafe(stream, arrangement, frontier_func, comparison, |timer, count| false, output_func) + half_join_internal_unsafe(stream, arrangement, frontier_func, comparison, |_timer, _count| false, output_func) } /// An unsafe variant of `half_join` where the `output_func` closure takes diff --git a/src/algorithms/graphs/sequential.rs b/src/algorithms/graphs/sequential.rs index 318503067..49a8a7c18 100644 --- a/src/algorithms/graphs/sequential.rs +++ b/src/algorithms/graphs/sequential.rs @@ -53,7 +53,7 @@ where F: Fn(&N, &[(&V, isize)])->V+'static { - let timer = ::std::time::Instant::now(); + let _timer = ::std::time::Instant::now(); // start iteration with None messages for all. state