Skip to content

Commit 17da43d

Browse files
committed
Small fix and re-simplification
I'm reverting the workaround here as I'm done with debugging for the time being. This code currently trips a beta regression. See <rust-lang/rust#89190>.
1 parent eff73c3 commit 17da43d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ impl<'a> Display for dyn 'a + DyncastEq {
745745
}
746746
impl<'a> PartialEq for dyn 'a + DyncastEq {
747747
fn eq(&self, other: &Self) -> bool {
748-
unsafe{self.dyncast_::<dyn 'a + PartialEq<dyn 'a+DyncastEq>, dyn PartialEq<dyn DyncastEq>>()}
748+
unsafe{self.dyncast_::<dyn 'a + PartialEq<dyn 'a + Dyncast>, dyn PartialEq<dyn Dyncast>>()}
749749
.expect("Expected `Self` to be *dynamically* `dyn PartialEq<dyn Dyncast>` via `dyn DyncastOrd: PartialOrd`")
750750
.eq(other)
751751
}
@@ -798,15 +798,15 @@ impl<'a> Display for dyn 'a + DyncastOrd {
798798
}
799799
impl<'a> PartialEq for dyn 'a + DyncastOrd {
800800
fn eq(&self, other: &Self) -> bool {
801-
self.as_dyncast_eq().eq(other.as_dyncast_eq())
801+
self.as_dyncast_eq().eq(other)
802802
}
803803
}
804804
impl<'a> Eq for dyn 'a + DyncastOrd {}
805805
impl<'a> PartialOrd for dyn 'a + DyncastOrd {
806806
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
807807
unsafe{self.dyncast_::<dyn 'a+PartialOrd<dyn 'a+Dyncast>,dyn PartialOrd<dyn Dyncast>>()}
808808
.expect("Expected `Self` to be *dynamically* `dyn PartialOrd<dyn Dyncast>` via `dyn DyncastOrd: PartialOrd`")
809-
.partial_cmp(other.as_dyncast())
809+
.partial_cmp(other)
810810
}
811811
}
812812
impl<'a> Ord for dyn 'a + DyncastOrd {

0 commit comments

Comments
 (0)