Skip to content

refactor(allocator/vec): simplify comparison macros #11178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
May 20, 2025
Merged

refactor(allocator/vec): simplify comparison macros #11178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions crates/oxc_allocator/src/vec2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2363,14 +2363,15 @@ impl<'a, T: 'a + Copy> Extend<&'a T> for Vec<'_, T> {
}
}

////////////////////////////////////////////////////////////////////////////////
// Comparison
////////////////////////////////////////////////////////////////////////////////

macro_rules! __impl_slice_eq1 {
($Lhs: ty, $Rhs: ty) => {
__impl_slice_eq1! { $Lhs, $Rhs, Sized }
};
($Lhs: ty, $Rhs: ty, $Bound: ident) => {
impl<'a, 'b, A: $Bound, B> PartialEq<$Rhs> for $Lhs
($Rhs: ty) => {
impl<T, U> PartialEq<$Rhs> for Vec<'_, T>
where
A: PartialEq<B>,
T: PartialEq<U>,
{
#[inline]
fn eq(&self, other: &$Rhs) -> bool {
Expand All @@ -2380,16 +2381,15 @@ macro_rules! __impl_slice_eq1 {
};
}

__impl_slice_eq1! { Vec<'a, A>, Vec<'b, B> }
__impl_slice_eq1! { Vec<'a, A>, &'b [B] }
__impl_slice_eq1! { Vec<'a, A>, &'b mut [B] }
// __impl_slice_eq1! { Cow<'a, [A]>, Vec<'b, B>, Clone }
__impl_slice_eq1! { Vec<'_, U> }
__impl_slice_eq1! { &[U] }
__impl_slice_eq1! { &mut [U] }

macro_rules! __impl_slice_eq1_array {
($Lhs: ty, $Rhs: ty) => {
impl<'a, 'b, A, B, const N: usize> PartialEq<$Rhs> for $Lhs
($Rhs: ty) => {
impl<T, U, const N: usize> PartialEq<$Rhs> for Vec<'_, T>
where
A: PartialEq<B>,
T: PartialEq<U>,
{
#[inline]
fn eq(&self, other: &$Rhs) -> bool {
Expand All @@ -2399,9 +2399,9 @@ macro_rules! __impl_slice_eq1_array {
};
}

__impl_slice_eq1_array! { Vec<'a, A>, [B; N] }
__impl_slice_eq1_array! { Vec<'a, A>, &'b [B; N] }
__impl_slice_eq1_array! { Vec<'a, A>, &'b mut [B; N] }
__impl_slice_eq1_array! { [U; N] }
__impl_slice_eq1_array! { &[U; N] }
__impl_slice_eq1_array! { &mut [U; N] }

/// Implements comparison of vectors, lexicographically.
impl<'a, T: 'a + PartialOrd> PartialOrd for Vec<'a, T> {
Expand All @@ -2421,6 +2421,10 @@ impl<'a, T: 'a + Ord> Ord for Vec<'a, T> {
}
}

////////////////////////////////////////////////////////////////////////////////
// Misc
////////////////////////////////////////////////////////////////////////////////

impl<'a, T: 'a + fmt::Debug> fmt::Debug for Vec<'a, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(&**self, f)
Expand Down
Loading