From 595dfccc6289ed56b69016228586a8a94d646cc0 Mon Sep 17 00:00:00 2001
From: Moritz Hoffmann <antiguru@gmail.com>
Date: Sat, 17 Feb 2024 20:27:42 -0500
Subject: [PATCH] Update pub uses

Signed-off-by: Moritz Hoffmann <antiguru@gmail.com>
---
 timely/src/dataflow/operators/core/mod.rs | 13 +++++++++++++
 timely/src/dataflow/operators/mod.rs      | 16 ++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/timely/src/dataflow/operators/core/mod.rs b/timely/src/dataflow/operators/core/mod.rs
index 1e3540bd1..ce794caf8 100644
--- a/timely/src/dataflow/operators/core/mod.rs
+++ b/timely/src/dataflow/operators/core/mod.rs
@@ -1,14 +1,27 @@
 //! Extension traits for `Stream` implementing various operators that
 //! are independent of specific container types.
 
+pub mod concat;
+pub mod exchange;
+pub mod filter;
 pub mod input;
+pub mod inspect;
 pub mod map;
 pub mod ok_err;
+pub mod probe;
+pub mod rc;
+pub mod reclock;
 pub mod to_stream;
 pub mod unordered_input;
 
+pub use concat::{Concat, Concatenate};
+pub use exchange::Exchange;
+pub use filter::Filter;
 pub use input::Input;
 pub use map::Map;
 pub use ok_err::OkErr;
+pub use probe::{Probe, Handle};
+pub use rc::SharedStream;
+pub use reclock::Reclock;
 pub use to_stream::ToStream;
 pub use unordered_input::{UnorderedHandle, UnorderedInput};
diff --git a/timely/src/dataflow/operators/mod.rs b/timely/src/dataflow/operators/mod.rs
index 8c1162875..b47d07e22 100644
--- a/timely/src/dataflow/operators/mod.rs
+++ b/timely/src/dataflow/operators/mod.rs
@@ -30,7 +30,7 @@ pub use self::result::ResultStream;
 pub use self::generic::Operator;
 pub use self::generic::{Notificator, FrontierNotificator};
 
-pub use self::reclock::Reclock;
+pub use self::core::reclock::Reclock;
 pub use self::count::Accumulate;
 
 pub mod core;
@@ -40,26 +40,26 @@ pub mod input;
 pub mod flow_controlled;
 pub mod unordered_input;
 pub mod feedback;
-pub mod concat;
+pub use self::core::concat;
 pub mod partition;
 pub mod map;
-pub mod inspect;
-pub mod filter;
+pub use self::core::inspect;
+pub use self::core::filter;
 pub mod delay;
-pub mod exchange;
+pub use self::core::exchange;
 pub mod broadcast;
-pub mod probe;
+pub use self::core::probe;
 pub mod to_stream;
 pub mod capture;
 pub mod branch;
 pub mod ok_err;
-pub mod rc;
+pub use self::core::rc;
 pub mod result;
 
 pub mod aggregation;
 pub mod generic;
 
-pub mod reclock;
+pub use self::core::reclock;
 pub mod count;
 
 // keep "mint" module-private