Fix mdbook

Signed-off-by: Moritz Hoffmann <[email protected]>

Author: antiguru

mdbook/src/chapter_4/chapter_4_1.md

@@ -18,12 +18,13 @@ You can create a new scope in any other scope by invoking the `scoped` method:
 extern crate timely;
 
 use timely::dataflow::Scope;
+use timely::progress::SubgraphBuilder;
 
 fn main() {
     timely::example(|scope| {
 
         // Create a new scope with the same (u64) timestamp.
-        scope.scoped::<u64,_,_>("SubScope", |subscope| {
+        scope.scoped::<u64,_,_,SubgraphBuilder<_,_>>("SubScope", |subscope| {
             // probably want something here
         })
 
@@ -46,14 +47,15 @@ extern crate timely;
 
 use timely::dataflow::Scope;
 use timely::dataflow::operators::*;
+use timely::progress::SubgraphBuilder;
 
 fn main() {
     timely::example(|scope| {
 
         let stream = (0 .. 10).to_stream(scope);
 
         // Create a new scope with the same (u64) timestamp.
-        let result = scope.scoped::<u64,_,_>("SubScope", |subscope| {
+        let result = scope.scoped::<u64,_,_,SubgraphBuilder<_,_>>("SubScope", |subscope| {
             stream.enter(subscope)
                   .inspect_batch(|t, xs| println!("{:?}, {:?}", t, xs))
                   .leave()
@@ -108,14 +110,15 @@ extern crate timely;
 
 use timely::dataflow::Scope;
 use timely::dataflow::operators::*;
+use timely::progress::SubgraphBuilder;
 
 fn main() {
     timely::example(|scope| {
 
         let stream = (0 .. 10).to_stream(scope);
 
         // Create a new scope with a (u64, u32) timestamp.
-        let result = scope.iterative::<u32,_,_>(|subscope| {
+        let result = scope.iterative::<u32,_,_,SubgraphBuilder<_,_>>(|subscope| {
             stream.enter(subscope)
                   .inspect_batch(|t, xs| println!("{:?}, {:?}", t, xs))
                   .leave()

mdbook/src/chapter_4/chapter_4_2.md

@@ -89,6 +89,7 @@ extern crate timely;
 
 use timely::dataflow::operators::*;
 use timely::dataflow::Scope;
+use timely::progress::SubgraphBuilder;
 
 fn main() {
     timely::example(|scope| {
@@ -97,7 +98,7 @@ fn main() {
 
         // Create a nested iterative scope.
         // Rust needs help understanding the iteration counter type.
-        scope.iterative::<u64,_,_>(|subscope| {
+        scope.iterative::<u64,_,_,SubgraphBuilder<_,_>>(|subscope| {
 
             let (handle, stream) = subscope.loop_variable(1);
 

timely/examples/event_driven_thread_stat.rs

@@ -3,8 +3,8 @@ use std::rc::Rc;
 use std::time::Duration;
 use timely::dataflow::operators::{Input, Map, Probe};
 use timely::logging::{TimelyLogger, TimelySummaryLogger};
-use timely::progress::{Antichain, ChangeBatch, Operate, Source, SubgraphBuilder, Target, Timestamp};
-use timely::progress::operate::SharedProgress;
+use timely::progress::{ChangeBatch, Operate, Source, SubgraphBuilder, Target, Timestamp};
+use timely::progress::operate::{Connectivity, SharedProgress};
 use timely::progress::subgraph::SubgraphBuilderT;
 use timely::progress::timestamp::Refines;
 use timely::scheduling::Schedule;
@@ -53,7 +53,7 @@ impl<TOuter: Timestamp, OP: Operate<TOuter>> Operate<TOuter> for ThreadStatSubgr
         self.inner.outputs()
     }
 
-    fn get_internal_summary(&mut self) -> (Vec<Vec<Antichain<TOuter::Summary>>>, Rc<RefCell<SharedProgress<TOuter>>>) {
+    fn get_internal_summary(&mut self) -> (Connectivity<TOuter::Summary>, Rc<RefCell<SharedProgress<TOuter>>>) {
         self.inner.get_internal_summary()
     }
 
@@ -294,12 +294,12 @@ fn main() {
 
         // create a new input, exchange data, and inspect its output
         for _dataflow in 0 .. dataflows {
-            let logging = worker.log_register().get("timely").map(Into::into);
+            let logging = worker.logging();
             worker.dataflow_subgraph::<_, _, _, _, ThreadStatSubgraphBuilder<SubgraphBuilder<_, _>>>("Dataflow", logging, (), |(), scope| {
                 let (input, mut stream) = scope.new_input();
                 for _step in 0 .. length {
                     stream = stream.map(|x: ()| {
-                        // Simluate CPU intensive task
+                        // Simulate CPU intensive task
                         for i in 0..1_000_000 {
                             std::hint::black_box(i);
                         }