From ba28a7acef96b164830c4d45682c3af332b21f6d Mon Sep 17 00:00:00 2001 From: timofey Date: Tue, 30 May 2023 01:01:24 +0000 Subject: [PATCH] `|resolution|` -> `|resolved|` --- src/rstd/collections/avl/binary.rs | 4 ++-- src/rstd/collections/avl/bounds.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rstd/collections/avl/binary.rs b/src/rstd/collections/avl/binary.rs index 03e4542..0bab368 100644 --- a/src/rstd/collections/avl/binary.rs +++ b/src/rstd/collections/avl/binary.rs @@ -76,8 +76,8 @@ impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>> AvlTree<'a, Ctx, A> { impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>> AvlReference<'a, Ctx, A> { pub fn resolve(&self) -> Resolution<'a, Ctx, AvlNode<'a, Ctx, A>> { let parent_height = self.parent_height; - ::fmap(self.node.resolve(), move |resolution| { - let node = resolution?; + ::fmap(self.node.resolve(), move |resolved| { + let node = resolved?; node.matches_height(parent_height) .map_err(ResolutionError::Parse)?; Ok(node) diff --git a/src/rstd/collections/avl/bounds.rs b/src/rstd/collections/avl/bounds.rs index 824a648..3cff077 100644 --- a/src/rstd/collections/avl/bounds.rs +++ b/src/rstd/collections/avl/bounds.rs @@ -248,8 +248,8 @@ pub type BrKeySplit<'a, Ctx, A> = BoundResolution<'a, Ctx, A, BoundKeySplit<'a, impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>> BoundReference<'a, Ctx, A> { pub fn resolve(&self, comparator: Rc>) -> BrNode<'a, Ctx, A> { let bounds = self.bounds.clone(); - ::fmap(self.reference.resolve(), move |resolution| { - let node = resolution + ::fmap(self.reference.resolve(), move |resolved| { + let node = resolved .map_err(|e| e.map_parse(BoundError::Avl))? .as_ref() .clone();