Skip to content

Commit

Permalink
Update bounds to track timely master
Browse files Browse the repository at this point in the history
  • Loading branch information
frankmcsherry committed Nov 27, 2024
1 parent 4dfb13a commit fb26ec0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ fnv="1.0.2"
timely = {workspace = true}

[workspace.dependencies]
timely = { version = "0.14", default-features = false }
#timely = { path = "../timely-dataflow/timely/", default-features = false }
#timely = { version = "0.14", default-features = false }
timely = { path = "../timely-dataflow/timely/", default-features = false }

[features]
default = ["timely/getopts"]
Expand Down
4 changes: 2 additions & 2 deletions src/collection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl<G: Scope, D, R, C> Collection<G, D, R, C> {
Collection { inner: stream, phantom: std::marker::PhantomData }
}
}
impl<G: Scope, D, R, C: Container> Collection<G, D, R, C> {
impl<G: Scope, D, R, C: Container + Clone + 'static> Collection<G, D, R, C> {
/// Creates a new collection accumulating the contents of the two collections.
///
/// Despite the name, differential dataflow collections are unordered. This method is so named because the
Expand Down Expand Up @@ -654,7 +654,7 @@ where
G: Scope,
D: Data,
R: Semigroup+'static,
C: Container,
C: Container + Clone + 'static,
I: IntoIterator<Item=Collection<G, D, R, C>>,
{
scope
Expand Down
2 changes: 1 addition & 1 deletion src/operators/arrange/arrangement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ where
P: ParallelizationContract<G::Timestamp, <Tr::Batcher as Batcher>::Input>,
Tr: Trace<Time=G::Timestamp>+'static,
Tr::Batch: Batch,
<Tr::Batcher as Batcher>::Input: timely::Container,
<Tr::Batcher as Batcher>::Input: timely::Container + Clone + 'static,
{
// The `Arrange` operator is tasked with reacting to an advancing input
// frontier by producing the sequence of batches whose lower and upper
Expand Down
2 changes: 1 addition & 1 deletion src/trace/implementations/chunker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ where

impl<Output> ContainerBuilder for ContainerChunker<Output>
where
Output: SizableContainer + ConsolidateLayout,
Output: SizableContainer + ConsolidateLayout + Clone + 'static,
{
type Container = Output;

Expand Down

0 comments on commit fb26ec0

Please sign in to comment.