Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion container/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ license = "MIT"

[dependencies]
columnation = { git = "https://github.com/frankmcsherry/columnation" }
flatcontainer = "0.4"
flatcontainer = "0.5"
serde = { version = "1.0"}
5 changes: 3 additions & 2 deletions timely/src/order.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,11 @@ mod product {
}

pub mod flatcontainer {
use timely_container::flatcontainer::{Containerized, IntoOwned, Push, Region, ReserveItems};
use timely_container::flatcontainer::{IntoOwned, Push, Region, RegionPreference, ReserveItems};
use super::Product;

impl<TO: Containerized, TI: Containerized> Containerized for Product<TO, TI> {
impl<TO: RegionPreference, TI: RegionPreference> RegionPreference for Product<TO, TI> {
type Owned = Product<TO::Owned, TI::Owned>;
type Region = ProductRegion<TO::Region, TI::Region>;
}

Expand Down