From c368a51fe1509a1df598681fdaae1cff37d3da71 Mon Sep 17 00:00:00 2001 From: timofey <tim@ongoteam.yaconnect.com> Date: Sun, 30 Jul 2023 14:55:21 +0000 Subject: [PATCH] `BoundNode2` -> `BoundNode` --- src/flow/binary/bound.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/flow/binary/bound.rs b/src/flow/binary/bound.rs index 0f655ae..fefe201 100644 --- a/src/flow/binary/bound.rs +++ b/src/flow/binary/bound.rs @@ -17,7 +17,7 @@ impl<A, T> std::ops::Deref for Bound<A, T> { } } -pub struct BoundNode2<A, T> { +pub struct BoundNode<A, T> { boundsl: Bounds<A>, boundsr: Bounds<A>, bounds: Bounds<A>, @@ -53,7 +53,7 @@ pub trait BinaryTreesBindable<'a>: BinaryTrees<'a> { } impl<'a, BT: BinaryTreesBindable<'a>> BinaryTrees<'a> for BoundTrees<BT> { - type Node = BoundNode2<Self::Key, BT::Node>; + type Node = BoundNode<Self::Key, BT::Node>; type Reference = Bound<Self::Key, BT::Reference>; @@ -92,7 +92,7 @@ impl<'a, BT: BinaryTreesBindable<'a>> BinaryTrees<'a> for BoundTrees<BT> { ctx.bounds_bind( bounds.clone().split(&key, ctx.comparator()), |(boundsl, boundsr)| { - Self::pure(BoundNode2 { + Self::pure(BoundNode { boundsl, boundsr, bounds, @@ -187,13 +187,11 @@ impl<'a, BT: BinaryTreesBindable<'a> + BinaryTreesTryJoin<'a>> BinaryTreesTryJoi self.0.bounds_bind( Bounds::join(boundsl.clone(), boundsr.clone(), &key, self.comparator()), |bounds| { - Self::fmap(self.0.try_join(tl.bound, key, tr.bound), |node| { - BoundNode2 { - boundsl, - boundsr, - bounds, - node, - } + Self::fmap(self.0.try_join(tl.bound, key, tr.bound), |node| BoundNode { + boundsl, + boundsr, + bounds, + node, }) }, )