Skip to content

Commit 0018516

Browse files
committed
Rollup merge of rust-lang#33590 - durka:patch-22, r=aturon
update "reason" for fnbox feature gate It isn't "newly introduced" anymore.
2 parents 88ecbc4 + b9fce76 commit 0018516

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/liballoc/boxed.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -525,14 +525,16 @@ impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {}
525525
/// }
526526
/// ```
527527
#[rustc_paren_sugar]
528-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
528+
#[unstable(feature = "fnbox",
529+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
529530
pub trait FnBox<A> {
530531
type Output;
531532

532533
fn call_box(self: Box<Self>, args: A) -> Self::Output;
533534
}
534535

535-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
536+
#[unstable(feature = "fnbox",
537+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
536538
impl<A, F> FnBox<A> for F where F: FnOnce<A>
537539
{
538540
type Output = F::Output;
@@ -542,7 +544,8 @@ impl<A, F> FnBox<A> for F where F: FnOnce<A>
542544
}
543545
}
544546

545-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
547+
#[unstable(feature = "fnbox",
548+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
546549
impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + 'a> {
547550
type Output = R;
548551

@@ -551,7 +554,8 @@ impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + 'a> {
551554
}
552555
}
553556

554-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "28796")]
557+
#[unstable(feature = "fnbox",
558+
reason = "will be deprecated if and when Box<FnOnce> becomes usable", issue = "28796")]
555559
impl<'a, A, R> FnOnce<A> for Box<FnBox<A, Output = R> + Send + 'a> {
556560
type Output = R;
557561

0 commit comments

Comments
 (0)