Skip to content

Commit f19aca6

Browse files
frankmcsherryfrankmcsherry
committed
Clean-up
1 parent b73cc96 commit f19aca6

File tree

14 files changed

+53
-59
lines changed

14 files changed

+53
-59
lines changed

‎differential-dataflow/src/operators/arrange/agent.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ pub struct TraceAgent<Tr: TraceReader> {
3636
logging: Option<crate::logging::Logger>,
3737
}
3838

39-
use crate::trace::implementations::LaidOut;
40-
impl<Tr: TraceReader> LaidOut for TraceAgent<Tr> {
39+
use crate::trace::implementations::WithLayout;
40+
impl<Tr: TraceReader> WithLayout for TraceAgent<Tr> {
4141
type Layout = Tr::Layout;
4242
}
4343

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ where
150150

151151
let reader = &mut reader;
152152

153-
let exchange = Exchange::<(K, Option<V>, G::Timestamp), _>::new(move |update: &(K,Option<V>,G::Timestamp)| (update.0).hashed().into());
153+
let exchange = Exchange::new(move |update: &(K,Option<V>,G::Timestamp)| (update.0).hashed().into());
154154

155155
stream.unary_frontier(exchange, name, move |_capability, info| {
156156

‎differential-dataflow/src/trace/cursor/cursor_list.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ impl<C: Cursor> CursorList<C> {
9494
}
9595
}
9696

97-
use crate::trace::implementations::LaidOut;
98-
impl<C: Cursor> LaidOut for CursorList<C> {
97+
use crate::trace::implementations::WithLayout;
98+
impl<C: Cursor> WithLayout for CursorList<C> {
9999
type Layout = C::Layout;
100100
}
101101

‎differential-dataflow/src/trace/implementations/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ pub trait Layout {
106106
}
107107

108108
/// A type bearing a layout.
109-
pub trait LaidOut {
109+
pub trait WithLayout {
110110
/// The layout.
111111
type Layout: Layout;
112112
}
113113

114114
/// Automatically implemented trait for types with layouts.
115-
pub trait LayoutExt : LaidOut<Layout: Layout<KeyContainer = Self::KeyContainer, ValContainer = Self::ValContainer, TimeContainer = Self::TimeContainer, DiffContainer = Self::DiffContainer>> {
115+
pub trait LayoutExt : WithLayout<Layout: Layout<KeyContainer = Self::KeyContainer, ValContainer = Self::ValContainer, TimeContainer = Self::TimeContainer, DiffContainer = Self::DiffContainer>> {
116116
/// Alias for an owned key of a layout.
117117
type KeyOwn;
118118
/// Alias for an borrowed key of a layout.
@@ -152,7 +152,7 @@ pub trait LayoutExt : LaidOut<Layout: Layout<KeyContainer = Self::KeyContainer,
152152
fn clone_time_onto(time: Self::TimeGat<'_>, onto: &mut Self::Time);
153153
}
154154

155-
impl<L: LaidOut> LayoutExt for L {
155+
impl<L: WithLayout> LayoutExt for L {
156156
type KeyOwn = <<L::Layout as Layout>::KeyContainer as BatchContainer>::Owned;
157157
type Key<'a> = <<L::Layout as Layout>::KeyContainer as BatchContainer>::ReadItem<'a>;
158158
type ValOwn = <<L::Layout as Layout>::ValContainer as BatchContainer>::Owned;

‎differential-dataflow/src/trace/implementations/ord_neu.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ pub mod val_batch {
322322
pub updates: usize,
323323
}
324324

325-
impl<L: Layout> LaidOut for OrdValBatch<L> {
325+
impl<L: Layout> WithLayout for OrdValBatch<L> {
326326
type Layout = L;
327327
}
328328

@@ -592,8 +592,8 @@ pub mod val_batch {
592592
phantom: PhantomData<L>,
593593
}
594594

595-
use crate::trace::implementations::LaidOut;
596-
impl<L: Layout> LaidOut for OrdValCursor<L> {
595+
use crate::trace::implementations::WithLayout;
596+
impl<L: Layout> WithLayout for OrdValCursor<L> {
597597
type Layout = L;
598598
}
599599

@@ -794,7 +794,7 @@ pub mod key_batch {
794794
pub updates: usize,
795795
}
796796

797-
impl<L: for<'a> Layout<ValContainer: BatchContainer<ReadItem<'a> = &'a ()>>> LaidOut for OrdKeyBatch<L> {
797+
impl<L: for<'a> Layout<ValContainer: BatchContainer<ReadItem<'a> = &'a ()>>> WithLayout for OrdKeyBatch<L> {
798798
type Layout = L;
799799
}
800800

@@ -983,8 +983,8 @@ pub mod key_batch {
983983
phantom: PhantomData<L>,
984984
}
985985

986-
use crate::trace::implementations::LaidOut;
987-
impl<L: for<'a> Layout<ValContainer: BatchContainer<ReadItem<'a> = &'a ()>>> LaidOut for OrdKeyCursor<L> {
986+
use crate::trace::implementations::WithLayout;
987+
impl<L: for<'a> Layout<ValContainer: BatchContainer<ReadItem<'a> = &'a ()>>> WithLayout for OrdKeyCursor<L> {
988988
type Layout = L;
989989
}
990990

‎differential-dataflow/src/trace/implementations/rhh.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ mod val_batch {
273273
pub updates: usize,
274274
}
275275

276-
impl<L: Layout> LaidOut for RhhValBatch<L>
276+
impl<L: Layout> WithLayout for RhhValBatch<L>
277277
where
278278
layout::Key<L>: Default + HashOrdered,
279279
for<'a> layout::KeyRef<'a, L>: HashOrdered,
@@ -651,8 +651,8 @@ mod val_batch {
651651
phantom: PhantomData<L>,
652652
}
653653

654-
use crate::trace::implementations::LaidOut;
655-
impl<L: Layout> LaidOut for RhhValCursor<L>
654+
use crate::trace::implementations::WithLayout;
655+
impl<L: Layout> WithLayout for RhhValCursor<L>
656656
where
657657
layout::Key<L>: Default + HashOrdered,
658658
for<'a> layout::KeyRef<'a, L>: HashOrdered,

‎differential-dataflow/src/trace/implementations/spine_fueled.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,12 @@ pub struct Spine<B: Batch> {
9999
exert_logic: Option<ExertionLogic>,
100100
}
101101

102-
use crate::trace::LaidOut;
103-
impl<B: Batch> LaidOut for Spine<B> {
102+
use crate::trace::WithLayout;
103+
impl<B: Batch> WithLayout for Spine<B> {
104104
type Layout = B::Layout;
105105
}
106106

107107
impl<B: Batch+Clone+'static> TraceReader for Spine<B> {
108-
// type Key<'a> = B::Key<'a>;
109-
// type Val<'a> = B::Val<'a>;
110-
// type Time = B::Time;
111-
// type TimeGat<'a> = B::TimeGat<'a>;
112-
// type Diff = B::Diff;
113-
// type DiffGat<'a> = B::DiffGat<'a>;
114108

115109
type Batch = B;
116110
type Storage = Vec<B>;

‎differential-dataflow/src/trace/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub trait TraceReader : LayoutExt {
5151
'static +
5252
Clone +
5353
BatchReader +
54-
LaidOut<Layout = Self::Layout> +
54+
WithLayout<Layout = Self::Layout> +
5555
for<'a> LayoutExt<
5656
Key<'a> = Self::Key<'a>,
5757
KeyOwn = Self::KeyOwn,
@@ -74,7 +74,7 @@ pub trait TraceReader : LayoutExt {
7474
/// The type used to enumerate the collections contents.
7575
type Cursor:
7676
Cursor<Storage=Self::Storage> +
77-
LaidOut<Layout = Self::Layout> +
77+
WithLayout<Layout = Self::Layout> +
7878
for<'a> LayoutExt<
7979
Key<'a> = Self::Key<'a>,
8080
KeyOwn = Self::KeyOwn,
@@ -237,7 +237,7 @@ pub trait Trace : TraceReader<Batch: Batch> {
237237
fn close(&mut self);
238238
}
239239

240-
use crate::trace::implementations::LaidOut;
240+
use crate::trace::implementations::WithLayout;
241241

242242
/// A batch of updates whose contents may be read.
243243
///
@@ -250,7 +250,7 @@ pub trait BatchReader : LayoutExt + Sized {
250250
/// The type used to enumerate the batch's contents.
251251
type Cursor:
252252
Cursor<Storage=Self> +
253-
LaidOut<Layout = Self::Layout> +
253+
WithLayout<Layout = Self::Layout> +
254254
for<'a> LayoutExt<
255255
Key<'a> = Self::Key<'a>,
256256
KeyOwn = Self::KeyOwn,
@@ -377,7 +377,7 @@ pub mod rc_blanket_impls {
377377
use timely::progress::{Antichain, frontier::AntichainRef};
378378
use super::{Batch, BatchReader, Builder, Merger, Cursor, Description};
379379

380-
impl<B: BatchReader> LaidOut for Rc<B> {
380+
impl<B: BatchReader> WithLayout for Rc<B> {
381381
type Layout = B::Layout;
382382
}
383383

@@ -401,8 +401,8 @@ pub mod rc_blanket_impls {
401401
cursor: C,
402402
}
403403

404-
use crate::trace::implementations::LaidOut;
405-
impl<C: Cursor> LaidOut for RcBatchCursor<C> {
404+
use crate::trace::implementations::WithLayout;
405+
impl<C: Cursor> WithLayout for RcBatchCursor<C> {
406406
type Layout = C::Layout;
407407
}
408408

‎differential-dataflow/src/trace/wrappers/enter.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl<Tr: TraceReader + Clone, TInner> Clone for TraceEnter<Tr, TInner> {
2525
}
2626
}
2727

28-
impl<Tr, TInner> LaidOut for TraceEnter<Tr, TInner>
28+
impl<Tr, TInner> WithLayout for TraceEnter<Tr, TInner>
2929
where
3030
Tr: TraceReader<Batch: Clone>,
3131
TInner: Refines<Tr::Time>+Lattice,
@@ -116,7 +116,7 @@ pub struct BatchEnter<B, TInner> {
116116
description: Description<TInner>,
117117
}
118118

119-
impl<B, TInner> LaidOut for BatchEnter<B, TInner>
119+
impl<B, TInner> WithLayout for BatchEnter<B, TInner>
120120
where
121121
B: BatchReader,
122122
TInner: Refines<B::Time>+Lattice,
@@ -168,8 +168,8 @@ pub struct CursorEnter<C, TInner> {
168168
cursor: C,
169169
}
170170

171-
use crate::trace::implementations::{Layout, LaidOut};
172-
impl<C, TInner> LaidOut for CursorEnter<C, TInner>
171+
use crate::trace::implementations::{Layout, WithLayout};
172+
impl<C, TInner> WithLayout for CursorEnter<C, TInner>
173173
where
174174
C: Cursor,
175175
TInner: Refines<C::Time>+Lattice,
@@ -242,7 +242,7 @@ impl<C, TInner> BatchCursorEnter<C, TInner> {
242242
}
243243
}
244244

245-
impl<C, TInner> LaidOut for BatchCursorEnter<C, TInner>
245+
impl<C, TInner> WithLayout for BatchCursorEnter<C, TInner>
246246
where
247247
C: Cursor,
248248
TInner: Refines<C::Time>+Lattice,

‎differential-dataflow/src/trace/wrappers/enter_at.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ where
4040
}
4141
}
4242

43-
impl<Tr, TInner, F, G> LaidOut for TraceEnter<Tr, TInner, F, G>
43+
impl<Tr, TInner, F, G> WithLayout for TraceEnter<Tr, TInner, F, G>
4444
where
4545
Tr: TraceReader<Batch: Clone>,
4646
TInner: Refines<Tr::Time>+Lattice,
@@ -140,7 +140,7 @@ pub struct BatchEnter<B, TInner, F> {
140140
logic: F,
141141
}
142142

143-
impl<B, TInner, F> LaidOut for BatchEnter<B, TInner, F>
143+
impl<B, TInner, F> WithLayout for BatchEnter<B, TInner, F>
144144
where
145145
B: BatchReader,
146146
TInner: Refines<B::Time>+Lattice,
@@ -196,8 +196,8 @@ pub struct CursorEnter<C, TInner, F> {
196196
logic: F,
197197
}
198198

199-
use crate::trace::implementations::{Layout, LaidOut};
200-
impl<C, TInner, F> LaidOut for CursorEnter<C, TInner, F>
199+
use crate::trace::implementations::{Layout, WithLayout};
200+
impl<C, TInner, F> WithLayout for CursorEnter<C, TInner, F>
201201
where
202202
C: Cursor,
203203
TInner: Refines<C::Time>+Lattice,
@@ -267,7 +267,7 @@ pub struct BatchCursorEnter<C, TInner, F> {
267267
logic: F,
268268
}
269269

270-
impl<C, TInner, F> LaidOut for BatchCursorEnter<C, TInner, F>
270+
impl<C, TInner, F> WithLayout for BatchCursorEnter<C, TInner, F>
271271
where
272272
C: Cursor,
273273
TInner: Refines<C::Time>+Lattice,

0 commit comments

Comments
 (0)