Skip to content

Commit 3dd255e

Browse files
committed
make impl_chain_conversions! emit fully qualified syntax
1 parent 8da98ab commit 3dd255e

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

packages/chain/src/lib.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -567,21 +567,20 @@ macro_rules! impl_chain_conversions {
567567
where
568568
Self: 'mut_chain;
569569

570-
#[deny(unconditional_recursion)]
571570
#[inline]
572571
fn as_inner(&self) -> &Self::Inner {
573-
self.as_inner()
572+
$crate::Chain::as_inner(self)
574573
}
575574

576-
#[deny(unconditional_recursion)]
577575
#[inline]
578576
fn as_inner_mut(&mut self) -> &mut Self::Inner {
579-
self.as_inner_mut()
577+
$crate::Chain::as_inner_mut(self)
580578
}
581579

582580
#[inline]
583581
fn as_mut_chain(&mut self) -> $crate::Chain<&mut $inner> {
584-
$crate::Chain::from_inner(self.as_inner_mut())
582+
let inner = $crate::Chain::as_inner_mut(self);
583+
$crate::Chain::from_inner(inner)
585584
}
586585
}
587586

@@ -592,21 +591,20 @@ macro_rules! impl_chain_conversions {
592591
where
593592
Self: 'mut_chain;
594593

595-
#[deny(unconditional_recursion)]
596594
#[inline]
597595
fn as_inner(&self) -> &Self::Inner {
598-
self.as_inner()
596+
*$crate::Chain::as_inner(self)
599597
}
600598

601-
#[deny(unconditional_recursion)]
602599
#[inline]
603600
fn as_inner_mut(&mut self) -> &mut Self::Inner {
604-
self.as_inner_mut()
601+
*$crate::Chain::as_inner_mut(self)
605602
}
606603

607604
#[inline]
608605
fn as_mut_chain(&mut self) -> $crate::Chain<&mut $inner> {
609-
$crate::Chain::from_inner(*self.as_inner_mut())
606+
let inner = $crate::Chain::as_inner_mut(self);
607+
$crate::Chain::from_inner(*inner)
610608
}
611609
}
612610

@@ -629,7 +627,7 @@ macro_rules! impl_chain_conversions {
629627

630628
#[inline]
631629
fn as_mut_chain(&mut self) -> $crate::Chain<&mut $inner> {
632-
Chain::from_inner(self)
630+
$crate::Chain::from_inner(self)
633631
}
634632
}
635633

@@ -644,7 +642,7 @@ macro_rules! impl_chain_conversions {
644642

645643
#[inline]
646644
fn into_inner(self) -> $inner {
647-
<$inner as $crate::ChainInner>::from_chain(self)
645+
$crate::Chain::into_inner(self)
648646
}
649647
}
650648

0 commit comments

Comments
 (0)