diff options
| -rw-r--r-- | library/core/src/cmp.rs | 4 | ||||
| -rw-r--r-- | library/core/src/const_closure.rs | 63 | ||||
| -rw-r--r-- | library/core/src/iter/adapters/array_chunks.rs | 12 | ||||
| -rw-r--r-- | library/core/src/iter/adapters/by_ref_sized.rs | 10 | ||||
| -rw-r--r-- | library/core/src/iter/adapters/mod.rs | 6 |
5 files changed, 48 insertions, 47 deletions
diff --git a/library/core/src/cmp.rs b/library/core/src/cmp.rs index 5033e744def..f0fa2e1d2c1 100644 --- a/library/core/src/cmp.rs +++ b/library/core/src/cmp.rs @@ -1267,7 +1267,7 @@ where { f(v1).cmp(&f(v2)) } - min_by(v1, v2, ConstFnMutClosure { data: &mut f, func: imp }) + min_by(v1, v2, ConstFnMutClosure::new(&mut f, imp)) } /// Compares and returns the maximum of two values. @@ -1352,7 +1352,7 @@ where { f(v1).cmp(&f(v2)) } - max_by(v1, v2, ConstFnMutClosure { data: &mut f, func: imp }) + max_by(v1, v2, ConstFnMutClosure::new(&mut f, imp)) } // Implementation of PartialEq, Eq, PartialOrd and Ord for primitive types diff --git a/library/core/src/const_closure.rs b/library/core/src/const_closure.rs index 23b3f87e721..9e9c02093be 100644 --- a/library/core/src/const_closure.rs +++ b/library/core/src/const_closure.rs @@ -23,36 +23,53 @@ pub(crate) struct ConstFnMutClosure<CapturedData, Function> { /// The Function of the Closure, must be: Fn(CapturedData, ClosureArgs) -> ClosureReturn pub func: Function, } +impl<'a, CapturedData: ?Sized, Function> ConstFnMutClosure<&'a mut CapturedData, Function> { + /// Function for creating a new closure. + /// + /// `data` is the a mutable borrow of data that is captured from the environment. + /// If you want Data to be a tuple of mutable Borrows, the struct must be constructed manually. + /// + /// `func` is the function of the closure, it gets the data and a tuple of the arguments closure + /// and return the return value of the closure. + pub(crate) const fn new<ClosureArguments, ClosureReturnValue>( + data: &'a mut CapturedData, + func: Function, + ) -> Self + where + Function: ~const Fn(&mut CapturedData, ClosureArguments) -> ClosureReturnValue, + { + Self { data, func } + } +} macro_rules! impl_fn_mut_tuple { ($($var:ident)*) => { - #[allow(unused_parens)] - impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const - FnOnce<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function> - where - Function: ~const Fn(($(&mut $var),*), ClosureArguments) -> ClosureReturnValue+ ~const Destruct, - { - type Output = ClosureReturnValue; + #[allow(unused_parens)] + impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const + FnOnce<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function> + where + Function: ~const Fn(($(&mut $var),*), ClosureArguments) -> ClosureReturnValue+ ~const Destruct, + { + type Output = ClosureReturnValue; - extern "rust-call" fn call_once(mut self, args: ClosureArguments) -> Self::Output { - self.call_mut(args) + extern "rust-call" fn call_once(mut self, args: ClosureArguments) -> Self::Output { + self.call_mut(args) + } } - } - #[allow(unused_parens)] - impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const - FnMut<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function> - where - Function: ~const Fn(($(&mut $var),*), ClosureArguments)-> ClosureReturnValue, - { - extern "rust-call" fn call_mut(&mut self, args: ClosureArguments) -> Self::Output { - #[allow(non_snake_case)] - let ($($var),*) = &mut self.data; - (self.func)(($($var),*), args) + #[allow(unused_parens)] + impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const + FnMut<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function> + where + Function: ~const Fn(($(&mut $var),*), ClosureArguments)-> ClosureReturnValue, + { + extern "rust-call" fn call_mut(&mut self, args: ClosureArguments) -> Self::Output { + #[allow(non_snake_case)] + let ($($var),*) = &mut self.data; + (self.func)(($($var),*), args) + } } - } - }; - } +} impl_fn_mut_tuple!(A); impl_fn_mut_tuple!(A B); impl_fn_mut_tuple!(A B C); diff --git a/library/core/src/iter/adapters/array_chunks.rs b/library/core/src/iter/adapters/array_chunks.rs index 02abce986cb..489fb13c0dc 100644 --- a/library/core/src/iter/adapters/array_chunks.rs +++ b/library/core/src/iter/adapters/array_chunks.rs @@ -88,11 +88,7 @@ where Self: Sized, F: FnMut(B, Self::Item) -> B, { - self.try_fold( - init, - ConstFnMutClosure { data: &mut f, func: NeverShortCircuit::wrap_mut_2_imp }, - ) - .0 + self.try_fold(init, ConstFnMutClosure::new(&mut f, NeverShortCircuit::wrap_mut_2_imp)).0 } } @@ -136,11 +132,7 @@ where Self: Sized, F: FnMut(B, Self::Item) -> B, { - self.try_rfold( - init, - ConstFnMutClosure { data: &mut f, func: NeverShortCircuit::wrap_mut_2_imp }, - ) - .0 + self.try_rfold(init, ConstFnMutClosure::new(&mut f, NeverShortCircuit::wrap_mut_2_imp)).0 } } diff --git a/library/core/src/iter/adapters/by_ref_sized.rs b/library/core/src/iter/adapters/by_ref_sized.rs index f3b8cfdb47b..1945e402ff5 100644 --- a/library/core/src/iter/adapters/by_ref_sized.rs +++ b/library/core/src/iter/adapters/by_ref_sized.rs @@ -44,12 +44,8 @@ impl<I: Iterator> Iterator for ByRefSized<'_, I> { F: FnMut(B, Self::Item) -> B, { // `fold` needs ownership, so this can't forward directly. - I::try_fold( - self.0, - init, - ConstFnMutClosure { data: &mut f, func: NeverShortCircuit::wrap_mut_2_imp }, - ) - .0 + I::try_fold(self.0, init, ConstFnMutClosure::new(&mut f, NeverShortCircuit::wrap_mut_2_imp)) + .0 } #[inline] @@ -88,7 +84,7 @@ impl<I: DoubleEndedIterator> DoubleEndedIterator for ByRefSized<'_, I> { I::try_rfold( self.0, init, - ConstFnMutClosure { data: &mut f, func: NeverShortCircuit::wrap_mut_2_imp }, + ConstFnMutClosure::new(&mut f, NeverShortCircuit::wrap_mut_2_imp), ) .0 } diff --git a/library/core/src/iter/adapters/mod.rs b/library/core/src/iter/adapters/mod.rs index 8f8748feae4..de3a534f81b 100644 --- a/library/core/src/iter/adapters/mod.rs +++ b/library/core/src/iter/adapters/mod.rs @@ -209,11 +209,7 @@ where Self: Sized, F: FnMut(B, Self::Item) -> B, { - self.try_fold( - init, - ConstFnMutClosure { data: &mut fold, func: NeverShortCircuit::wrap_mut_2_imp }, - ) - .0 + self.try_fold(init, ConstFnMutClosure::new(&mut fold, NeverShortCircuit::wrap_mut_2_imp)).0 } } |