diff --git a/src/rcore/dectx.rs b/src/rcore/dectx.rs index 2d4aa47..dac2673 100644 --- a/src/rcore/dectx.rs +++ b/src/rcore/dectx.rs @@ -15,13 +15,7 @@ pub trait DeCtx<'a, Ctx: Context<'a>> { fn resolver(&self) -> Rc>; - fn adr( - &mut self, - ) -> ( - &mut Addresses, - &mut dyn Deserializer, - &Rc>, - ); + fn ad(&mut self) -> (&mut Addresses, &mut dyn Deserializer); } impl<'a: 'c, 'c, Ctx: Context<'a>> DeCtx<'a, Ctx> for DeCtxT<'a, 'c, Ctx> { @@ -41,13 +35,7 @@ impl<'a: 'c, 'c, Ctx: Context<'a>> DeCtx<'a, Ctx> for DeCtxT<'a, 'c, Ctx> { self.resolver.clone() } - fn adr( - &mut self, - ) -> ( - &mut Addresses, - &mut dyn Deserializer, - &Rc>, - ) { - (&mut self.addresses, self.deserializer, self.resolver) + fn ad(&mut self) -> (&mut Addresses, &mut dyn Deserializer) { + (&mut self.addresses, self.deserializer) } } diff --git a/src/rcore/inctx.rs b/src/rcore/inctx.rs index 231d94d..418fa8a 100644 --- a/src/rcore/inctx.rs +++ b/src/rcore/inctx.rs @@ -42,7 +42,7 @@ impl<'a: 'c, 'c, Ctx: Context<'a>> Inlining for &'c mut dyn DeCtx<'a, Ctx> { impl<'a: 'c, 'c, Ctx: Context<'a>> InCtx<'a, Ctx> for &'c mut dyn DeCtx<'a, Ctx> { fn icnext_address(self, err: impl FnOnce(&[u8]) -> E) -> Result<(Address, Self), E> { - let (addresses, deserialiser, _) = self.adr(); + let (addresses, deserialiser) = self.ad(); match deserialiser.inext_address(addresses, err) { Ok((address, _)) => Ok((address, self)), Err(e) => Err(e),