PTV/radn-rs
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

adr -> ad

Browse Source
This commit is contained in:
AF 2023-06-30 23:32:09 +00:00
parent 540fdce02a
commit 98ce4b0e13
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rcore/dectx.rs
View File

@ -15,13 +15,7 @@ pub trait DeCtx<'a, Ctx: Context<'a>> {
fn resolver(&self) -> Rc<dyn Resolver<'a, Ctx>>; fn resolver(&self) -> Rc<dyn Resolver<'a, Ctx>>;
fn adr( fn ad(&mut self) -> (&mut Addresses, &mut dyn Deserializer);
&mut self,
) -> (
&mut Addresses,
&mut dyn Deserializer,
&Rc<dyn Resolver<'a, Ctx>>,
);
} }
impl<'a: 'c, 'c, Ctx: Context<'a>> DeCtx<'a, Ctx> for DeCtxT<'a, 'c, Ctx> { 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() self.resolver.clone()
} }
fn adr( fn ad(&mut self) -> (&mut Addresses, &mut dyn Deserializer) {
&mut self, (&mut self.addresses, self.deserializer)
) -> (
&mut Addresses,
&mut dyn Deserializer,
&Rc<dyn Resolver<'a, Ctx>>,
) {
(&mut self.addresses, self.deserializer, self.resolver)
} }
} }

2
src/rcore/inctx.rs
View File

@ -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> { impl<'a: 'c, 'c, Ctx: Context<'a>> InCtx<'a, Ctx> for &'c mut dyn DeCtx<'a, Ctx> {
fn icnext_address<E>(self, err: impl FnOnce(&[u8]) -> E) -> Result<(Address, Self), E> { fn icnext_address<E>(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) { match deserialiser.inext_address(addresses, err) {
Ok((address, _)) => Ok((address, self)), Ok((address, _)) => Ok((address, self)),
Err(e) => Err(e), Err(e) => Err(e),