mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
Rollup merge of #112628 - gootorov:box_alloc_partialeq, r=joshtriplett
Allow comparing `Box`es with different allocators Currently, comparing `Box`es over different allocators is not allowed: ```Rust error[E0308]: mismatched types --> library/alloc/tests/boxed.rs:22:20 | 22 | assert_eq!(b1, b2); | ^^ expected `Box<{integer}, ConstAllocator>`, found `Box<{integer}, AnotherAllocator>` | = note: expected struct `Box<{integer}, ConstAllocator>` found struct `Box<{integer}, AnotherAllocator>` For more information about this error, try `rustc --explain E0308`. error: could not compile `alloc` (test "collectionstests") due to previous error ``` This PR lifts this limitation
This commit is contained in:
commit
448d2a8417
@ -1319,39 +1319,56 @@ impl Clone for Box<str> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
impl<T: ?Sized + PartialEq, A: Allocator> PartialEq for Box<T, A> {
|
impl<T, A1, A2> PartialEq<Box<T, A2>> for Box<T, A1>
|
||||||
|
where
|
||||||
|
T: ?Sized + PartialEq,
|
||||||
|
A1: Allocator,
|
||||||
|
A2: Allocator,
|
||||||
|
{
|
||||||
#[inline]
|
#[inline]
|
||||||
fn eq(&self, other: &Self) -> bool {
|
fn eq(&self, other: &Box<T, A2>) -> bool {
|
||||||
PartialEq::eq(&**self, &**other)
|
PartialEq::eq(&**self, &**other)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn ne(&self, other: &Self) -> bool {
|
fn ne(&self, other: &Box<T, A2>) -> bool {
|
||||||
PartialEq::ne(&**self, &**other)
|
PartialEq::ne(&**self, &**other)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
impl<T: ?Sized + PartialOrd, A: Allocator> PartialOrd for Box<T, A> {
|
impl<T, A1, A2> PartialOrd<Box<T, A2>> for Box<T, A1>
|
||||||
|
where
|
||||||
|
T: ?Sized + PartialOrd,
|
||||||
|
A1: Allocator,
|
||||||
|
A2: Allocator,
|
||||||
|
{
|
||||||
#[inline]
|
#[inline]
|
||||||
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
fn partial_cmp(&self, other: &Box<T, A2>) -> Option<Ordering> {
|
||||||
PartialOrd::partial_cmp(&**self, &**other)
|
PartialOrd::partial_cmp(&**self, &**other)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn lt(&self, other: &Self) -> bool {
|
fn lt(&self, other: &Box<T, A2>) -> bool {
|
||||||
PartialOrd::lt(&**self, &**other)
|
PartialOrd::lt(&**self, &**other)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn le(&self, other: &Self) -> bool {
|
fn le(&self, other: &Box<T, A2>) -> bool {
|
||||||
PartialOrd::le(&**self, &**other)
|
PartialOrd::le(&**self, &**other)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn ge(&self, other: &Self) -> bool {
|
fn ge(&self, other: &Box<T, A2>) -> bool {
|
||||||
PartialOrd::ge(&**self, &**other)
|
PartialOrd::ge(&**self, &**other)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn gt(&self, other: &Self) -> bool {
|
fn gt(&self, other: &Box<T, A2>) -> bool {
|
||||||
PartialOrd::gt(&**self, &**other)
|
PartialOrd::gt(&**self, &**other)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
impl<T: ?Sized + Ord, A: Allocator> Ord for Box<T, A> {
|
impl<T: ?Sized + Ord, A: Allocator> Ord for Box<T, A> {
|
||||||
#[inline]
|
#[inline]
|
||||||
|
Loading…
Reference in New Issue
Block a user