Skip to content

Commit

Permalink
more changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MingweiSamuel
MingweiSamuel committed Jul 2, 2024
1 parent 60d03f7 commit d58c07d
Showing 1 changed file with 74 additions and 50 deletions.
124 changes: 74 additions & 50 deletions variadics/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ pub trait VariadicExt: Variadic {
fn reverse(self) -> Self::Reverse;

/// This as a variadic of references.
type AsRefVar<'a>: RefVariadic<UnRef = Self>
type AsRefVar<'a>: RefVariadic<
UnRefVar = Self,
RefVar = Self::AsRefVar<'a>,
MutVar = Self::AsMutVar<'a>,
>
where
Self: 'a;
/// Convert a reference to this variadic into a variadic of references.
Expand All @@ -139,7 +143,11 @@ pub trait VariadicExt: Variadic {
fn as_ref_var(&self) -> Self::AsRefVar<'_>;

/// This as a variadic of exclusive (`mut`) references.
type AsMutVar<'a>: MutVariadic<UnRef = Self>
type AsMutVar<'a>: MutVariadic<
UnRefVar = Self,
RefVar = Self::AsRefVar<'a>,
MutVar = Self::AsMutVar<'a>,
>
where
Self: 'a;
/// Convert an exclusive (`mut`) reference to this variadic into a variadic of exclusive
Expand Down Expand Up @@ -275,7 +283,7 @@ impl VariadicExt for () {

/// A variadic of either shared references, exclusive references, or both.
///
/// Provides the [`Self::UnRef`] associated type which is the original variadic of owned values.
/// Provides the [`Self::UnRefVar`] associated type which is the original variadic of owned values.
///
/// This is a sealed trait.
#[sealed]
Expand All @@ -286,28 +294,70 @@ pub trait EitherRefVariadic {
///
/// ```rust
/// # use variadics::*;
/// let un_ref: <var_type!(&u32, &String, &bool) as RefVariadic>::UnRef =
/// let un_ref: <var_type!(&u32, &String, &bool) as EitherRefVariadic>::UnRefVar =
/// var_expr!(1_u32, "Hello".to_owned(), false);
/// ```
type UnRef: Variadic;
type UnRefVar: Variadic;

/// This type with all exclusive `&mut` references replaced with shared `&` references.
///
/// Returned by [`Self::mut_to_ref`].
type RefVar: RefVariadic<UnRefVar = Self::UnRefVar, RefVar = Self::RefVar>;
/// Convert all exclusive (`mut`) references into shared references: [`RefVariadic`].
///
/// ```rust
/// # use variadics::*;
/// let mut original = var_expr!(1_u32, "Hello".to_owned(), false);
/// let as_mut: var_type!(&mut u32, &mut String, &mut bool) = original.as_mut_var();
/// let as_ref_1: var_type!(&u32, &String, &bool) = as_mut.mut_to_ref();
/// let as_ref_2: var_type!(&u32, &String, &bool) = as_ref_1; // Can copy the reference version.
/// drop((as_ref_1, as_ref_2));
/// ```
fn mut_to_ref(self) -> Self::RefVar;

/// This type with all shared `&` references replaced with exclusive references `&mut`.
///
/// Conversion from `&` to `&mut` is generally invalid, so a `ref_to_mut()` method does not exist.
type MutVar: MutVariadic<UnRefVar = Self::UnRefVar, MutVar = Self::MutVar>;
}
#[sealed]
impl<Item, Rest> EitherRefVariadic for (&Item, Rest)
impl<'a, Item, Rest> EitherRefVariadic for (&'a Item, Rest)
where
Rest: EitherRefVariadic,
{
type UnRef = (Item, Rest::UnRef);
type UnRefVar = (Item, Rest::UnRefVar);

type RefVar = (&'a Item, Rest::RefVar);
fn mut_to_ref(self) -> Self::RefVar {
let var_args!(item, ...rest) = self;
var_expr!(item, ...rest.mut_to_ref())
}

type MutVar = (&'a mut Item, Rest::MutVar);
}
#[sealed]
impl<Item, Rest> EitherRefVariadic for (&mut Item, Rest)
impl<'a, Item, Rest> EitherRefVariadic for (&'a mut Item, Rest)
where
Rest: EitherRefVariadic,
{
type UnRef = (Item, Rest::UnRef);
type UnRefVar = (Item, Rest::UnRefVar);

type RefVar = (&'a Item, Rest::RefVar);
fn mut_to_ref(self) -> Self::RefVar {
let var_args!(item, ...rest) = self;
var_expr!(&*item, ...rest.mut_to_ref())
}

type MutVar = (&'a mut Item, Rest::MutVar);
}
#[sealed]
impl EitherRefVariadic for () {
type UnRef = ();
type UnRefVar = ();

type RefVar = ();
fn mut_to_ref(self) -> Self::RefVar {}

type MutVar = ();
}

/// A variadic where each item is a shared reference `&item`.
Expand All @@ -321,7 +371,7 @@ impl EitherRefVariadic for () {
///
/// This is a sealed trait.
#[sealed]
pub trait RefVariadic: EitherRefVariadic
pub trait RefVariadic: EitherRefVariadic<RefVar = Self>
where
Self: Copy,
{
Expand All @@ -342,39 +392,13 @@ impl RefVariadic for () {}
///
/// This is a sealed trait.
#[sealed]
pub trait MutVariadic: EitherRefVariadic {
/// Type returned by [`Self::mut_to_ref`].
type MutToRef: RefVariadic<UnRef = Self::UnRef>;
/// Downgrade this to a variadic of shared references: [`RefVariadic`].
///
/// ```rust
/// # use variadics::*;
/// let mut original = var_expr!(1_u32, "Hello".to_owned(), false);
/// let as_mut: var_type!(&mut u32, &mut String, &mut bool) = original.as_mut_var();
/// let as_ref_1: var_type!(&u32, &String, &bool) = as_mut.mut_to_ref();
/// let as_ref_2: var_type!(&u32, &String, &bool) = as_ref_1; // Can copy the reference version.
/// drop((as_ref_1, as_ref_2));
/// ```
fn mut_to_ref(self) -> Self::MutToRef;
}
pub trait MutVariadic: EitherRefVariadic<MutVar = Self> {}
#[sealed]
impl<'a, Item, Rest> MutVariadic for (&'a mut Item, Rest)
where
Rest: MutVariadic,
{
type MutToRef = (&'a Item, Rest::MutToRef);
fn mut_to_ref(self) -> Self::MutToRef {
let var_args!(item, ...rest) = self;
var_expr!(&*item, ...rest.mut_to_ref())
}
}
impl<Item, Rest> MutVariadic for (&mut Item, Rest) where Rest: MutVariadic {}
#[sealed]
impl MutVariadic for () {
type MutToRef = ();
fn mut_to_ref(self) -> Self::MutToRef {}
}
impl MutVariadic for () {}

/// Copy an [`RefVariadic`] into an [`RefVariadic::UnRef`] variadic of owned values.
/// Copy an [`RefVariadic`] into an [`RefVariadic::UnRefVar`] variadic of owned values.

Check failure on line 401 in variadics/src/lib.rs

View workflow job for this annotation

GitHub Actions / Docs (rustdoc) 

unresolved link to `RefVariadic::UnRefVar`
///
/// ```rust
/// # use variadics::*;
Expand All @@ -385,15 +409,15 @@ impl MutVariadic for () {
#[sealed]
pub trait CopyRefVariadic: EitherRefVariadic {
/// Copy self per-value.
fn copy_var(&self) -> Self::UnRef;
fn copy_var(&self) -> Self::UnRefVar;
}
#[sealed]
impl<Item, Rest> CopyRefVariadic for (&Item, Rest)
where
Item: Copy,
Rest: CopyRefVariadic,
{
fn copy_var(&self) -> Self::UnRef {
fn copy_var(&self) -> Self::UnRefVar {
let var_args!(&item, ...rest) = self;
var_expr!(item, ...rest.copy_var())
}
Expand All @@ -404,17 +428,17 @@ where
Item: Copy,
Rest: CopyRefVariadic,
{
fn copy_var(&self) -> Self::UnRef {
fn copy_var(&self) -> Self::UnRefVar {
let var_args!(&mut item, ...rest) = self;
var_expr!(item, ...rest.copy_var())
}
}
#[sealed]
impl CopyRefVariadic for () {
fn copy_var(&self) -> Self::UnRef {}
fn copy_var(&self) -> Self::UnRefVar {}
}

/// Clone an [`RefVariadic`] into an [`RefVariadic::UnRef`] variadic of owned values.
/// Clone a variadic of references [`EitherRefVariadic`] into a variadic of owned values [`EitherRefVariadic::UnRefVar`].
///
/// ```rust
/// # use variadics::*;
Expand All @@ -428,15 +452,15 @@ impl CopyRefVariadic for () {
#[sealed]
pub trait CloneRefVariadic: EitherRefVariadic {
/// Clone self per-value.
fn clone_var(&self) -> Self::UnRef;
fn clone_var(&self) -> Self::UnRefVar;
}
#[sealed]
impl<Item, Rest> CloneRefVariadic for (&Item, Rest)
where
Item: Clone,
Rest: CloneRefVariadic,
{
fn clone_var(&self) -> Self::UnRef {
fn clone_var(&self) -> Self::UnRefVar {
let var_args!(item, ...rest) = self;
var_expr!((*item).clone(), ...rest.clone_var())
}
Expand All @@ -447,14 +471,14 @@ where
Item: Clone,
Rest: CloneRefVariadic,
{
fn clone_var(&self) -> Self::UnRef {
fn clone_var(&self) -> Self::UnRefVar {
let var_args!(item, ...rest) = self;
var_expr!((*item).clone(), ...rest.clone_var())
}
}
#[sealed]
impl CloneRefVariadic for () {
fn clone_var(&self) -> Self::UnRef {}
fn clone_var(&self) -> Self::UnRefVar {}
}

/// A variadic where all item implement `PartialEq`.
Expand Down

0 comments on commit d58c07d

Please sign in to comment.