From 3280db49e9dbce48f5ccdd03d13b3a95446e5a81 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Mon, 30 Dec 2024 08:48:15 +1100
Subject: [PATCH] Remove Eq trait bound

The `PartialOrd` trait is object safe but `Ord` is not. We can make
`ArbitraryOrd` object safe by softening the bounds and only requiring
`PartialEq` - we still provide a blanket implementation of `Ord` if `Eq`
is implemented for `T`.

Add a unit test that verifies using `Box<dyn T>` - props to Poelstra for
the idea.
---
 src/lib.rs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 09d680c..63ed658 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -82,7 +82,7 @@ use core::ops::{Deref, DerefMut};
 ///     }
 /// }
 /// ```
-pub trait ArbitraryOrd<Rhs = Self>: Eq + PartialEq<Rhs> {
+pub trait ArbitraryOrd<Rhs = Self>: PartialEq<Rhs> {
     /// Implements a meaningless, arbitrary ordering.
     fn arbitrary_cmp(&self, other: &Rhs) -> Ordering;
 }
@@ -154,11 +154,11 @@ impl<T: ArbitraryOrd> ArbitraryOrd for &T {
 }
 
 impl<T: ArbitraryOrd> PartialOrd for Ordered<T> {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> { Some(self.cmp(other)) }
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> { Some((*self).arbitrary_cmp(other)) }
 }
 
-impl<T: ArbitraryOrd> Ord for Ordered<T> {
-    fn cmp(&self, other: &Self) -> Ordering { self.0.arbitrary_cmp(&other.0) }
+impl<T: ArbitraryOrd + Eq> Ord for Ordered<T> {
+    fn cmp(&self, other: &Self) -> Ordering { (*self).arbitrary_cmp(other) }
 }
 
 impl<T: fmt::Display> fmt::Display for Ordered<T> {
@@ -260,4 +260,17 @@ mod tests {
         assert_send::<Ordered<Point>>();
         assert_sync::<Ordered<Point>>();
     }
+
+    #[test]
+    fn trait_is_object_safe() {
+        extern crate std;
+        use std::boxed::Box;
+
+        // If this test builds then `ArbitraryOrd` is object safe.
+        #[allow(dead_code)]
+        struct ObjectSafe {
+            p: Box<dyn ArbitraryOrd<Self>>,
+            q: Box<dyn PartialOrd<Self>>, // Sanity check.
+        }
+    }
 }