Skip to content

Commit 49e57e6

Browse files
committed
rust: Fixes for 1.67.0
Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 250ac97 commit 49e57e6

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

rust/alloc/boxed.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ impl<I: ExactSizeIterator + ?Sized, A: Allocator> ExactSizeIterator for Box<I, A
18691869
impl<I: FusedIterator + ?Sized, A: Allocator> FusedIterator for Box<I, A> {}
18701870

18711871
#[stable(feature = "boxed_closure_impls", since = "1.35.0")]
1872-
impl<Args, F: FnOnce<Args> + ?Sized, A: Allocator> FnOnce<Args> for Box<F, A> {
1872+
impl<Args: core::marker::Tuple, F: FnOnce<Args> + ?Sized, A: Allocator> FnOnce<Args> for Box<F, A> {
18731873
type Output = <F as FnOnce<Args>>::Output;
18741874

18751875
extern "rust-call" fn call_once(self, args: Args) -> Self::Output {
@@ -1878,14 +1878,14 @@ impl<Args, F: FnOnce<Args> + ?Sized, A: Allocator> FnOnce<Args> for Box<F, A> {
18781878
}
18791879

18801880
#[stable(feature = "boxed_closure_impls", since = "1.35.0")]
1881-
impl<Args, F: FnMut<Args> + ?Sized, A: Allocator> FnMut<Args> for Box<F, A> {
1881+
impl<Args: core::marker::Tuple, F: FnMut<Args> + ?Sized, A: Allocator> FnMut<Args> for Box<F, A> {
18821882
extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output {
18831883
<F as FnMut<Args>>::call_mut(self, args)
18841884
}
18851885
}
18861886

18871887
#[stable(feature = "boxed_closure_impls", since = "1.35.0")]
1888-
impl<Args, F: Fn<Args> + ?Sized, A: Allocator> Fn<Args> for Box<F, A> {
1888+
impl<Args: core::marker::Tuple, F: Fn<Args> + ?Sized, A: Allocator> Fn<Args> for Box<F, A> {
18891889
extern "rust-call" fn call(&self, args: Args) -> Self::Output {
18901890
<F as Fn<Args>>::call(self, args)
18911891
}

rust/alloc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
#![feature(trusted_len)]
142142
#![feature(trusted_random_access)]
143143
#![feature(try_trait_v2)]
144+
#![feature(tuple_trait)]
144145
#![feature(unchecked_math)]
145146
#![feature(unicode_internals)]
146147
#![feature(unsize)]

0 commit comments

Comments
 (0)