X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=library%2Fcore%2Fsrc%2Fiter%2Fadapters%2Fmod.rs;h=8cc2b7cec41650f273669b836593f809cbe4a899;hb=bf15a9e5263fcea065a7ae9c179b2d24c2deb670;hp=8f8748feae42c7368d54fdbe41af3705c4f47148;hpb=b73241aa5b0eab8aebf1600c598180bbd33be31c;p=rust.git diff --git a/library/core/src/iter/adapters/mod.rs b/library/core/src/iter/adapters/mod.rs index 8f8748feae4..8cc2b7cec41 100644 --- a/library/core/src/iter/adapters/mod.rs +++ b/library/core/src/iter/adapters/mod.rs @@ -1,6 +1,5 @@ -use crate::const_closure::ConstFnMutClosure; use crate::iter::{InPlaceIterable, Iterator}; -use crate::ops::{ChangeOutputType, ControlFlow, FromResidual, NeverShortCircuit, Residual, Try}; +use crate::ops::{ChangeOutputType, ControlFlow, FromResidual, Residual, Try}; mod array_chunks; mod by_ref_sized; @@ -204,17 +203,7 @@ fn try_fold(&mut self, init: B, mut f: F) -> T .into_try() } - fn fold(mut self, init: B, mut fold: F) -> B - where - Self: Sized, - F: FnMut(B, Self::Item) -> B, - { - self.try_fold( - init, - ConstFnMutClosure { data: &mut fold, func: NeverShortCircuit::wrap_mut_2_imp }, - ) - .0 - } + impl_fold_via_try_fold! { fold -> try_fold } } #[unstable(issue = "none", feature = "inplace_iteration")]