Skip to content

Commit 3bc82cd

Browse files
committed
Correct cargo doc glitches
1 parent c45a709 commit 3bc82cd

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

differential-dataflow/src/algorithms/graphs/propagate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use crate::operators::arrange::arrangement::Arranged;
5151
///
5252
/// This variant takes a pre-arranged edge collection, to facilitate re-use, and allows
5353
/// a method `logic` to specify the rounds in which we introduce various labels. The output
54-
/// of `logic should be a number in the interval [0,64],
54+
/// of `logic should be a number in the interval \[0,64\],
5555
pub fn propagate_core<G, N, L, Tr, F, R>(edges: &Arranged<G,Tr>, nodes: &VecCollection<G,(N,L),R>, logic: F) -> VecCollection<G,(N,L),R>
5656
where
5757
G: Scope<Timestamp=Tr::Time>,

differential-dataflow/src/collection.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::difference::{Semigroup, Abelian, Multiply};
2222
use crate::lattice::Lattice;
2323
use crate::hashable::Hashable;
2424

25-
/// A mutable collection of values of type `D`
25+
/// An evolving collection of values of type `D`, backed by Rust `Vec` types as containers.
2626
///
2727
/// The `Collection` type is the core abstraction in differential dataflow programs. As you write your
2828
/// differential dataflow computation, you write as if the collection is a static dataset to which you
@@ -31,15 +31,17 @@ use crate::hashable::Hashable;
3131
/// propagate changes through your functional computation and report the corresponding changes to the
3232
/// output collections.
3333
///
34-
/// Each collection has three generic parameters. The parameter `G` is for the scope in which the
34+
/// Each vec collection has three generic parameters. The parameter `G` is for the scope in which the
3535
/// collection exists; as you write more complicated programs you may wish to introduce nested scopes
3636
/// (e.g. for iteration) and this parameter tracks the scope (for timely dataflow's benefit). The `D`
3737
/// parameter is the type of data in your collection, for example `String`, or `(u32, Vec<Option<()>>)`.
3838
/// The `R` parameter represents the types of changes that the data undergo, and is most commonly (and
3939
/// defaults to) `isize`, representing changes to the occurrence count of each record.
40+
///
41+
/// This type definition instantiates the [`Collection`] type with a `Vec<(D, G::Timestamp, R)>`.
4042
pub type VecCollection<G, D, R = isize> = Collection<G, Vec<(D, <G as ScopeParent>::Timestamp, R)>>;
4143

42-
/// A collection represented by a stream of abstract containers.
44+
/// An evolving collection represented by a stream of abstract containers.
4345
///
4446
/// The containers purport to reperesent changes to a collection, and they must implement various traits
4547
/// in order to expose some of this functionality (e.g. negation, timestamp manipulation). Other actions

differential-dataflow/src/operators/arrange/upsert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ use super::TraceAgent;
119119

120120
/// Arrange data from a stream of keyed upserts.
121121
///
122-
/// The input should be a stream of timestamped pairs of Key and Option<Val>.
122+
/// The input should be a stream of timestamped pairs of `Key` and `Option<Val>`.
123123
/// The contents of the collection are defined key-by-key, where each optional
124124
/// value in sequence either replaces or removes the existing value, should it
125125
/// exist.

differential-dataflow/src/trace/implementations/chainless_batcher.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
//! A `Batcher` implementation based on merge sort.
2-
//!
3-
//! The `MergeBatcher` requires support from two types, a "chunker" and a "merger".
4-
//! The chunker receives input batches and consolidates them, producing sorted output
5-
//! "chunks" that are fully consolidated (no adjacent updates can be accumulated).
6-
//! The merger implements the [`Merger`] trait, and provides hooks for manipulating
7-
//! sorted "chains" of chunks as needed by the merge batcher: merging chunks and also
8-
//! splitting them apart based on time.
9-
//!
10-
//! Implementations of `MergeBatcher` can be instantiated through the choice of both
11-
//! the chunker and the merger, provided their respective output and input types align.
122
133
use timely::progress::frontier::AntichainRef;
144
use timely::progress::{frontier::Antichain, Timestamp};

differential-dataflow/src/trace/implementations/merge_batcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ pub mod container {
292292

293293
/// A merger for arbitrary containers.
294294
///
295-
/// `MC` is a [`Container`] that implements [`MergerChunk`].
295+
/// `MC` is a `Container` that implements [`MergerChunk`].
296296
/// `CQ` is a [`ContainerQueue`] supporting `MC`.
297297
pub struct ContainerMerger<MC, CQ> {
298298
_marker: PhantomData<(MC, CQ)>,

0 commit comments

Comments
 (0)