e3a8f7db47
Use more impl header lifetime elision Inspired by seeing explicit lifetimes on these two: - https://doc.rust-lang.org/nightly/std/slice/struct.Iter.html#impl-FusedIterator - https://doc.rust-lang.org/nightly/std/primitive.u32.html#impl-Not And a follow-up to https://github.com/rust-lang/rust/pull/54687, that started using IHLE in libcore. Most of the changes in here fall into two big categories: - Removing lifetimes from common traits that can essentially never user a lifetime from an input (particularly `Drop`, `Debug`, and `Clone`) - Forwarding impls that are only possible because the lifetime doesn't matter (like `impl<R: Read + ?Sized> Read for &mut R`) I omitted things that seemed like they could be more controversial, like the handful of iterators that have a `Item: 'static` despite the iterator having a lifetime or the `PartialEq` implementations [where the flipped one cannot elide the lifetime](https://internals.rust-lang.org/t/impl-type-parameter-aliases/9403/2?u=scottmcm). I also removed two lifetimes that turned out to be completely unused; see https://github.com/rust-lang/rust/issues/41960#issuecomment-464557423
121 lines
3.9 KiB
Rust
121 lines
3.9 KiB
Rust
// implements the unary operator "op &T"
|
|
// based on "op T" where T is expected to be `Copy`able
|
|
macro_rules! forward_ref_unop {
|
|
(impl $imp:ident, $method:ident for $t:ty) => {
|
|
forward_ref_unop!(impl $imp, $method for $t,
|
|
#[stable(feature = "rust1", since = "1.0.0")]);
|
|
};
|
|
(impl $imp:ident, $method:ident for $t:ty, #[$attr:meta]) => {
|
|
#[$attr]
|
|
impl $imp for &$t {
|
|
type Output = <$t as $imp>::Output;
|
|
|
|
#[inline]
|
|
fn $method(self) -> <$t as $imp>::Output {
|
|
$imp::$method(*self)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// implements binary operators "&T op U", "T op &U", "&T op &U"
|
|
// based on "T op U" where T and U are expected to be `Copy`able
|
|
macro_rules! forward_ref_binop {
|
|
(impl $imp:ident, $method:ident for $t:ty, $u:ty) => {
|
|
forward_ref_binop!(impl $imp, $method for $t, $u,
|
|
#[stable(feature = "rust1", since = "1.0.0")]);
|
|
};
|
|
(impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
|
|
#[$attr]
|
|
impl<'a> $imp<$u> for &'a $t {
|
|
type Output = <$t as $imp<$u>>::Output;
|
|
|
|
#[inline]
|
|
fn $method(self, other: $u) -> <$t as $imp<$u>>::Output {
|
|
$imp::$method(*self, other)
|
|
}
|
|
}
|
|
|
|
#[$attr]
|
|
impl<'a> $imp<&'a $u> for $t {
|
|
type Output = <$t as $imp<$u>>::Output;
|
|
|
|
#[inline]
|
|
fn $method(self, other: &'a $u) -> <$t as $imp<$u>>::Output {
|
|
$imp::$method(self, *other)
|
|
}
|
|
}
|
|
|
|
#[$attr]
|
|
impl<'a, 'b> $imp<&'a $u> for &'b $t {
|
|
type Output = <$t as $imp<$u>>::Output;
|
|
|
|
#[inline]
|
|
fn $method(self, other: &'a $u) -> <$t as $imp<$u>>::Output {
|
|
$imp::$method(*self, *other)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// implements "T op= &U", based on "T op= U"
|
|
// where U is expected to be `Copy`able
|
|
macro_rules! forward_ref_op_assign {
|
|
(impl $imp:ident, $method:ident for $t:ty, $u:ty) => {
|
|
forward_ref_op_assign!(impl $imp, $method for $t, $u,
|
|
#[stable(feature = "op_assign_builtins_by_ref", since = "1.22.0")]);
|
|
};
|
|
(impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
|
|
#[$attr]
|
|
impl<'a> $imp<&'a $u> for $t {
|
|
#[inline]
|
|
fn $method(&mut self, other: &'a $u) {
|
|
$imp::$method(self, *other);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Create a zero-size type similar to a closure type, but named.
|
|
#[unstable(feature = "std_internals", issue = "0")]
|
|
macro_rules! impl_fn_for_zst {
|
|
($(
|
|
$( #[$attr: meta] )*
|
|
// FIXME: when libcore is in the 2018 edition, use `?` repetition in
|
|
// $( <$( $li : lifetime ),+> )?
|
|
struct $Name: ident impl$( <$( $lifetime : lifetime ),+> )* Fn =
|
|
|$( $arg: ident: $ArgTy: ty ),*| -> $ReturnTy: ty
|
|
$body: block;
|
|
)+) => {
|
|
$(
|
|
$( #[$attr] )*
|
|
struct $Name;
|
|
|
|
impl $( <$( $lifetime ),+> )* Fn<($( $ArgTy, )*)> for $Name {
|
|
#[inline]
|
|
extern "rust-call" fn call(&self, ($( $arg, )*): ($( $ArgTy, )*)) -> $ReturnTy {
|
|
$body
|
|
}
|
|
}
|
|
|
|
impl $( <$( $lifetime ),+> )* FnMut<($( $ArgTy, )*)> for $Name {
|
|
#[inline]
|
|
extern "rust-call" fn call_mut(
|
|
&mut self,
|
|
($( $arg, )*): ($( $ArgTy, )*)
|
|
) -> $ReturnTy {
|
|
Fn::call(&*self, ($( $arg, )*))
|
|
}
|
|
}
|
|
|
|
impl $( <$( $lifetime ),+> )* FnOnce<($( $ArgTy, )*)> for $Name {
|
|
type Output = $ReturnTy;
|
|
|
|
#[inline]
|
|
extern "rust-call" fn call_once(self, ($( $arg, )*): ($( $ArgTy, )*)) -> $ReturnTy {
|
|
Fn::call(&self, ($( $arg, )*))
|
|
}
|
|
}
|
|
)+
|
|
}
|
|
}
|