Skip to content

FR: impl core::ops::* for F where F: Fn {} #68332

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

Closed
wants to merge 14 commits into from
Closed

FR: impl core::ops::* for F where F: Fn {} #68332

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4ea2711
Early impl attempt
Jan 18, 2020
c6ff965
woops
Jan 18, 2020
b1ef4b9
typos
Jan 18, 2020
0c0023b
oh jeez why am I such a noob
Jan 18, 2020
f6a3653
uhh ok now I really know I have no idea what I'm doing.
Jan 18, 2020
5d7f71f
use deref immediately
Jan 18, 2020
fd85792
wow I'm a mess
Jan 18, 2020
66a08aa
use base traits I guess, also fix doc
Jan 18, 2020
55af17f
I haven't used macros in a while...
Jan 18, 2020
a9dade8
oh I think you might stop shouting about incorrect type use in macros
Jan 18, 2020
88ba521
... nope, wrong type
Jan 18, 2020
c00a982
add binary ops
Feb 2, 2020
c59199d
NO_TEST attempt adding functions... ownership is gonna throw up on this
Feb 2, 2020
c36813f
express bounds more properly
Feb 2, 2020
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
182 changes: 182 additions & 0 deletions src/libcore/ops/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,185 @@ mod impls {
}
}
}

macro_rules! gen_fn_struct_unopt {
(impl $imp:ident, $method:ident in $m:ident; with $z:ty) => {
gen_fn_struct_unopt!(impl $imp, $method in $m; with $z,
#[unstable(feature = stringify!($m))]);
};
(impl $imp:ident, $method:ident in $m:ident; with $z:ty, #[$attr:meta]) => {
#[$attr]
mod $m {
use crate::ops::$imp;
#[$attr]
struct $z<F> {
f: F,
}
#[$attr]
impl<A, F: ?Sized> $imp for F
where
F: FnOnce<A>,
{
type Output = $z<F>;
fn $method(self) -> Self::Output {
$z { f: self }
}
}
#[$attr]
impl<A, F: ?Sized> $imp for $z<F>
where
F: FnOnce<A>,
{
type Output = F;
fn $method(self) -> Self::Output {
self.f
}
}
#[$attr]
impl<A, F: ?Sized> Fn<A> for &$z<F>
where
F: Fn<A>,
{
extern "rust-call" fn call(&self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f).call(args))
}
}

#[$attr]
impl<A, F: ?Sized> FnMut<A> for &$z<F>
where
F: Fn<A>,
{
extern "rust-call" fn call_mut(&mut self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f).call(args))
}
}

#[$attr]
impl<A, F: ?Sized> FnOnce<A> for &$z<F>
where
F: Fn<A>,
{
type Output = F::Output;

extern "rust-call" fn call_once(self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((*self).f).call(args))
}
}

#[$attr]
impl<A, F: ?Sized> FnMut<A> for &mut $z<F>
where
F: FnMut<A>,
{
extern "rust-call" fn call_mut(&mut self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((*self).f).call_mut(args))
}
}

#[$attr]
impl<A, F: ?Sized> FnOnce<A> for &mut $z<F>
where
F: FnMut<A>,
{
type Output = F::Output;
extern "rust-call" fn call_once(self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((*self).f).call_mut(args))
}
}
}
};
}

macro_rules! gen_fn_struct_biopt {
(impl $imp:ident, $method:ident in $m:path; with $z:ty) => {
gen_fn_struct_biopt!(impl $imp, $method in $m; with $z,
#[unstable(feature = stringify!($m))]);
};
(impl $imp:ident, $method:ident in $m:ident; with $z:ty, #[$attr:meta]) => {
#[$attr]
mod $m {
use crate::ops::$imp;
#[$attr]
struct $z<F1, F2> {
f1: F1,
f2: F2,
}
#[$attr]
impl<A, F1: ?Sized, F2: ?Sized> $imp<F2> for F1
where
F1: FnOnce<A>,
F2: FnOnce<A>,
{
type Output = $z<F1, F2>;
fn $method(self, that: F2) -> Self::Output {
$z { f1: self, f2: that }
}
}
#[$attr]
impl<A, F1: ?Sized, F2: ?Sized> Fn<A> for &$z<F1, F2>
where
F1: Fn<A>,
F2: Fn<A>,
{
extern "rust-call" fn call(&self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f1).call(args), ((**self).f2).call(args))
}
}

#[$attr]
impl<A, F1: ?Sized, F2: ?Sized> FnMut<A> for &$z<F1, F2>
where
F1: Fn<A>,
F2: Fn<A>,
{
extern "rust-call" fn call_mut(&mut self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f1).call(args), ((**self).f2).call(args))
}
}

#[$attr]
impl<A, F1: ?Sized, F2: ?Sized> FnOnce<A> for &$z<F1, F2>
where
F1: Fn<A>,
F2: Fn<A>,
{
type Output = F::Output;

extern "rust-call" fn call_once(self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f1).call(args), ((**self).f2).call(args))
}
}

#[$attr]
impl<A, F1: ?Sized, F2: ?Sized> FnMut<A> for &mut $z<F1, F2>
where
F1: FnMut<A>,
F2: FnMut<A>,
{
extern "rust-call" fn call_mut(&mut self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f1).call_mut(args), ((**self).f2).call_mut(args))
}
}

#[$attr]
impl<A, F1: ?Sized, F2: ?Sized> FnOnce<A> for &mut $z<F>
where
F1: FnMut<A>,
F2: FnMut<A>,
{
type Output = F::Output;
extern "rust-call" fn call_once(self, args: A) -> <F::Output as $imp>::Output {
$imp::$method(((**self).f1).call_mut(args), ((**self).f2).call_mut(args))
}
}
}
};
}

gen_fn_struct_unopt!(impl Not, not in fn_not_impl; with FnNot);
gen_fn_struct_unopt!(impl Neg, neg in fn_neg_impl; with FnNeg);

gen_fn_struct_biopt!(impl BitOr, bitor in fn_bitor_impl; with FnOr);
gen_fn_struct_biopt!(impl BitAnd, bitand in fn_bitand_impl; with FnAnd);
gen_fn_struct_biopt!(impl BitXor, bitxor in fn_bitxor_impl; with FnXor);