diff options
| author | bors <bors@rust-lang.org> | 2016-05-15 08:37:09 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-15 08:37:09 -0700 |
| commit | 9f58fb776a74a44f4fcc2cb57084d33c55530aa4 (patch) | |
| tree | 007f7ad1fef9ac62eeefe2b9f36eafba11431b4b /src/liballoc | |
| parent | b3583193531c124e36aa1813cf5f8b8e667d016c (diff) | |
| parent | 95ace6be43d3e037f8b812e03bd8ace3b0d9e50a (diff) | |
| download | rust-9f58fb776a74a44f4fcc2cb57084d33c55530aa4.tar.gz rust-9f58fb776a74a44f4fcc2cb57084d33c55530aa4.zip | |
Auto merge of #33658 - Manishearth:rollup, r=Manishearth
Rollup of 14 pull requests - Successful merges: #33342, #33393, #33415, #33475, #33517, #33533, #33534, #33565, #33580, #33584, #33585, #33590, #33591, #33598 - Failed merges: #33578
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 7bdf9eaccc3..10e4ea1c3f0 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -525,14 +525,16 @@ impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {} /// } /// ``` #[rustc_paren_sugar] -#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")] +#[unstable(feature = "fnbox", + reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")] pub trait FnBox<A> { type Output; fn call_box(self: Box<Self>, args: A) -> Self::Output; } -#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")] +#[unstable(feature = "fnbox", + reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")] impl<A, F> FnBox<A> for F where F: FnOnce<A> { type Output = F::Output; @@ -542,7 +544,8 @@ impl<A, F> FnBox<A> for F where F: FnOnce<A> } } -#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")] +#[unstable(feature = "fnbox", + reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")] impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + 'a> { type Output = R; @@ -551,7 +554,8 @@ impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + 'a> { } } -#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")] +#[unstable(feature = "fnbox", + reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")] impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + Send + 'a> { type Output = R; |
