Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5eaa949 authored by Charisee Chiw's avatar Charisee Chiw Committed by Automerger Merge Worker
Browse files

Merge "Update needed for Rust v1.73.0" into main am: 8e530280 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2787166



Change-Id: I254383b16841b93e8b34abf8faa6222aaba18362
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec07e2cc 8e530280

libs/binder/rust/src/binder.rs

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ impl<I: FromIBinder + ?Sized> Ord for Strong<I> { 


impl<I: FromIBinder + ?Sized> PartialOrd for Strong<I> {

    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {

        self.0.as_binder().partial_cmp(&other.0.as_binder())

        Some(self.cmp(other))

    }

}
@@ -483,7 +483,7 @@ impl<I: FromIBinder + ?Sized> Ord for Weak<I> { 


impl<I: FromIBinder + ?Sized> PartialOrd for Weak<I> {

    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {

        self.weak_binder.partial_cmp(&other.weak_binder)

        Some(self.cmp(other))

    }

}