|resolution|
-> |resolved|
This commit is contained in:
parent
6be1000993
commit
ba28a7acef
@ -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> {
|
impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>> AvlReference<'a, Ctx, A> {
|
||||||
pub fn resolve(&self) -> Resolution<'a, Ctx, AvlNode<'a, Ctx, A>> {
|
pub fn resolve(&self) -> Resolution<'a, Ctx, AvlNode<'a, Ctx, A>> {
|
||||||
let parent_height = self.parent_height;
|
let parent_height = self.parent_height;
|
||||||
<Ctx::T as Functor>::fmap(self.node.resolve(), move |resolution| {
|
<Ctx::T as Functor>::fmap(self.node.resolve(), move |resolved| {
|
||||||
let node = resolution?;
|
let node = resolved?;
|
||||||
node.matches_height(parent_height)
|
node.matches_height(parent_height)
|
||||||
.map_err(ResolutionError::Parse)?;
|
.map_err(ResolutionError::Parse)?;
|
||||||
Ok(node)
|
Ok(node)
|
||||||
|
@ -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> {
|
impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>> BoundReference<'a, Ctx, A> {
|
||||||
pub fn resolve(&self, comparator: Rc<impl 'a + Comparator<A>>) -> BrNode<'a, Ctx, A> {
|
pub fn resolve(&self, comparator: Rc<impl 'a + Comparator<A>>) -> BrNode<'a, Ctx, A> {
|
||||||
let bounds = self.bounds.clone();
|
let bounds = self.bounds.clone();
|
||||||
<Ctx::T as Functor>::fmap(self.reference.resolve(), move |resolution| {
|
<Ctx::T as Functor>::fmap(self.reference.resolve(), move |resolved| {
|
||||||
let node = resolution
|
let node = resolved
|
||||||
.map_err(|e| e.map_parse(BoundError::Avl))?
|
.map_err(|e| e.map_parse(BoundError::Avl))?
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.clone();
|
.clone();
|
||||||
|
Loading…
Reference in New Issue
Block a user