diff --git a/src/flow/binary/avl.rs b/src/flow/binary/avl.rs index ad287d7..e7ff54d 100644 --- a/src/flow/binary/avl.rs +++ b/src/flow/binary/avl.rs @@ -8,7 +8,7 @@ pub trait BinaryTreesAvl<'a>: BinaryTreesHeight<'a> { } } - fn join_key_unbalanced( + fn try_join( &self, tl: Self::Tree, key: Self::Key, @@ -33,7 +33,7 @@ pub trait BinaryTreesAvl<'a>: BinaryTreesHeight<'a> { ) -> BTWrap<'a, Self, Self::Node> { let (hl, hr) = (self.height(&tl), self.height(&tr)); match (hl.saturating_sub(hr), hr.saturating_sub(hl)) { - (0, 0) | (0, 1) | (1, 0) => self.join_key_unbalanced(tl, key, tr), + (0, 0) | (0, 1) | (1, 0) => self.try_join(tl, key, tr), (0, _) => Self::bind(self.assume_node(&tr), move |nr| { let (trl, trr, kr) = self.split(&nr); let (rlh, rrh) = (self.height(&trl), self.height(&trr)); diff --git a/src/flow/binary/bounds/bound.rs b/src/flow/binary/bounds/bound.rs index 37b71d7..70d9d42 100644 --- a/src/flow/binary/bounds/bound.rs +++ b/src/flow/binary/bounds/bound.rs @@ -159,7 +159,7 @@ impl<'a, BT: BinaryTreesBindable<'a> + BinaryTreesHeight<'a>> BinaryTreesHeight< } impl<'a, BT: BinaryTreesBindable<'a> + BinaryTreesAvl<'a>> BinaryTreesAvl<'a> for BoundTrees { - fn join_key_unbalanced( + fn try_join( &self, tl: Self::Tree, key: Self::Key, @@ -170,7 +170,7 @@ impl<'a, BT: BinaryTreesBindable<'a> + BinaryTreesAvl<'a>> BinaryTreesAvl<'a> fo Bounds::join(boundsl.clone(), boundsr.clone(), &key, self.comparator()), |bounds| { Self::fmap( - self.0.join_key_unbalanced(tl.bound, key, tr.bound), + self.0.try_join(tl.bound, key, tr.bound), |node| BoundNode2 { boundsl, boundsr, diff --git a/src/mrds/trees/avl.rs b/src/mrds/trees/avl.rs index 4270243..c8daf06 100644 --- a/src/mrds/trees/avl.rs +++ b/src/mrds/trees/avl.rs @@ -187,7 +187,7 @@ impl<'a, A: 'a + PartialOrd + Clone> BinaryTreesHeight<'a> for AvlTs { } impl<'a, A: 'a + PartialOrd + Clone> BinaryTreesAvl<'a> for AvlTs { - fn join_key_unbalanced( + fn try_join( &self, tl: Self::Tree, key: Self::Key, diff --git a/src/rstd/collections/avl/context.rs b/src/rstd/collections/avl/context.rs index 18bf278..831e862 100644 --- a/src/rstd/collections/avl/context.rs +++ b/src/rstd/collections/avl/context.rs @@ -114,7 +114,7 @@ impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx> + Clone, C: 'a + Comparator, A: Mentionable<'a, Ctx> + Clone, C: 'a + Comparator> BinaryTreesAvl<'a> for BoundContext<'a, Ctx, A, C> { - fn join_key_unbalanced( + fn try_join( &self, tl: Self::Tree, key: Self::Key,