summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Charisee Chiw <chiw@google.com> 2023-10-18 18:19:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-18 18:19:10 +0000
commit93c7536a55f41074c1d2abb0717b1e15a70bbb0d (patch)
treef4cde540d506fe2d5dea4459a2a0b35f5e35f9fa
parentd804f238e0313f2e6411acdd6ba1c11444ae4137 (diff)
parentb508794d3499d877407125dbadbabede8073da9b (diff)
Merge "Update needed for Rust v1.73.0" into main am: 8e5302800e am: e5eaa949a0 am: b508794d34
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2787166 Change-Id: Ie24bc755c4a79502bb36e9193deb24bf1a4e39f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/rust/src/binder.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/rust/src/binder.rs b/libs/binder/rust/src/binder.rs
index 463c210316..a08cb7ab39 100644
--- a/libs/binder/rust/src/binder.rs
+++ b/libs/binder/rust/src/binder.rs
@@ -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))
}
}