rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add Fn* blanket impls for Box.

Browse Source
This commit is contained in:
Masaki Hara
2018-10-28 15:28:15 +09:00
committed by CrLF0710
parent 79941973af
commit 059ec76d9b
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/liballoc/boxed.rs
View File

@@ -694,6 +694,37 @@ impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {
#[stable(feature = "fused", since = "1.26.0")] #[stable(feature = "fused", since = "1.26.0")]
impl<I: FusedIterator + ?Sized> FusedIterator for Box<I> {} impl<I: FusedIterator + ?Sized> FusedIterator for Box<I> {}
#[cfg(not(stage0))]
#[unstable(feature = "boxed_closure_impls",
reason = "Box<FnOnce> relies on unsized rvalues and needs to be tested more",
issue = "48055")]
impl<A, F: FnOnce<A> + ?Sized> FnOnce<A> for Box<F> {
type Output = <F as FnOnce<A>>::Output;
default extern "rust-call" fn call_once(self, args: A) -> Self::Output {
<F as FnOnce<A>>::call_once(*self, args)
}
}
#[cfg(not(stage0))]
#[unstable(feature = "boxed_closure_impls",
reason = "Box<FnOnce> relies on unsized rvalues and needs to be tested more",
issue = "48055")]
impl<A, F: FnMut<A> + ?Sized> FnMut<A> for Box<F> {
extern "rust-call" fn call_mut(&mut self, args: A) -> Self::Output {
<F as FnMut<A>>::call_mut(self, args)
}
}
#[cfg(not(stage0))]
#[unstable(feature = "boxed_closure_impls",
reason = "Box<FnOnce> relies on unsized rvalues and needs to be tested more",
issue = "48055")]
impl<A, F: Fn<A> + ?Sized> Fn<A> for Box<F> {
extern "rust-call" fn call(&self, args: A) -> Self::Output {
<F as Fn<A>>::call(self, args)
}
}
/// `FnBox` is a version of the `FnOnce` intended for use with boxed /// `FnBox` is a version of the `FnOnce` intended for use with boxed
/// closure objects. The idea is that where one would normally store a /// closure objects. The idea is that where one would normally store a
@@ -752,6 +783,7 @@ impl<A, F> FnBox<A> for F
#[unstable(feature = "fnbox", #[unstable(feature = "fnbox",
reason = "will be deprecated if and when `Box<FnOnce>` becomes usable", issue = "28796")] reason = "will be deprecated if and when `Box<FnOnce>` becomes usable", issue = "28796")]
impl<A, R> FnOnce<A> for Box<dyn FnBox<A, Output = R> + '_> { impl<A, R> FnOnce<A> for Box<dyn FnBox<A, Output = R> + '_> {
#[cfg(stage0)]
type Output = R; type Output = R;
extern "rust-call" fn call_once(self, args: A) -> R { extern "rust-call" fn call_once(self, args: A) -> R {
@@ -762,6 +794,7 @@ impl<A, R> FnOnce<A> for Box<dyn FnBox<A, Output = R> + '_> {
#[unstable(feature = "fnbox", #[unstable(feature = "fnbox",
reason = "will be deprecated if and when `Box<FnOnce>` becomes usable", issue = "28796")] reason = "will be deprecated if and when `Box<FnOnce>` becomes usable", issue = "28796")]
impl<A, R> FnOnce<A> for Box<dyn FnBox<A, Output = R> + Send + '_> { impl<A, R> FnOnce<A> for Box<dyn FnBox<A, Output = R> + Send + '_> {
#[cfg(stage0)]
type Output = R; type Output = R;
extern "rust-call" fn call_once(self, args: A) -> R { extern "rust-call" fn call_once(self, args: A) -> R {

1
src/liballoc/lib.rs
View File

@@ -107,6 +107,7 @@
#![feature(unboxed_closures)] #![feature(unboxed_closures)]
#![feature(unicode_internals)] #![feature(unicode_internals)]
#![feature(unsize)] #![feature(unsize)]
#![feature(unsized_locals)]
#![feature(allocator_internals)] #![feature(allocator_internals)]
#![feature(on_unimplemented)] #![feature(on_unimplemented)]
#![feature(rustc_const_unstable)] #![feature(rustc_const_unstable)]