From a72d2ed4414467313b93eb2236773a6b030631d6 Mon Sep 17 00:00:00 2001 From: timofey Date: Fri, 30 Jun 2023 22:30:01 +0000 Subject: [PATCH] remove `o_deserialise` --- src/rstd/atomic.rs | 4 ---- src/rstd/atomic/atomic_object.rs | 2 +- src/rstd/collections/tree.rs | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/rstd/atomic.rs b/src/rstd/atomic.rs index 7992931..ea63384 100644 --- a/src/rstd/atomic.rs +++ b/src/rstd/atomic.rs @@ -43,10 +43,6 @@ pub trait AtomicExt: Atomic { fn parse_slice(slice: &[u8]) -> AParseResult { _parse_slice(slice) } - - fn o_deserialise<'a, Ctx: Context<'a>>(dectx: &mut dyn DeCtx<'a, Ctx>) -> AParseResult { - Self::a_deserialize(dectx) - } } impl AtomicExt for A {} diff --git a/src/rstd/atomic/atomic_object.rs b/src/rstd/atomic/atomic_object.rs index 164c808..fc3ace4 100644 --- a/src/rstd/atomic/atomic_object.rs +++ b/src/rstd/atomic/atomic_object.rs @@ -73,7 +73,7 @@ impl<'a, Ctx: Context<'a>, A: Atomic> Factory<'a, Ctx> for AtomicFactory { type ParseError = A::AParseError; fn deserialize(&self, dectx: &mut dyn DeCtx<'a, Ctx>) -> ParseResult<'a, Ctx, Self> { - Ok(A::o_deserialise(dectx)?.into()) + Ok(A::a_deserialize(dectx)?.into()) } fn extend(&self, mentionable: Self::Mtbl, tail: &[u8]) -> ParseResult<'a, Ctx, Self> { diff --git a/src/rstd/collections/tree.rs b/src/rstd/collections/tree.rs index a02ee5e..c3fa7d7 100644 --- a/src/rstd/collections/tree.rs +++ b/src/rstd/collections/tree.rs @@ -160,7 +160,7 @@ impl<'a, Ctx: Context<'a>, F: Factory<'a, Ctx>> Factory<'a, Ctx> for TreeFactory fn deserialize(&self, dectx: &mut dyn DeCtx<'a, Ctx>) -> ParseResult<'a, Ctx, Self> { let node = self.0.deserialize(dectx)?; - let height = u64::o_deserialise(dectx)?; + let height = u64::a_deserialize(dectx)?; let tree = Tree { node, height }; tree.validate_height()?; Ok(tree)