diff options
| author | bors <bors@rust-lang.org> | 2021-06-06 11:31:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-06 11:31:16 +0000 |
| commit | f57d5ba3c9ffef4cd2402e3e7d8934bd1a6e9cc1 (patch) | |
| tree | 9bc36b15565d83984822ad38b4d9604e1e09e8af /library/core/src/array | |
| parent | 3740ba2a7dd965ca45db500ebf7ad580a7812c07 (diff) | |
| parent | 19433c44bde0dd6ed674bd03f1cefbfc2f95c676 (diff) | |
| download | rust-f57d5ba3c9ffef4cd2402e3e7d8934bd1a6e9cc1.tar.gz rust-f57d5ba3c9ffef4cd2402e3e7d8934bd1a6e9cc1.zip | |
Auto merge of #86054 - JohnTitor:rollup-j40z7sm, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #85436 (Avoid cloning cache key) - #85772 (Preserve metadata w/ Solaris-like linkers.) - #85920 (Tweak wasm_base target spec to indicate linker is not GNU and update linker inferring logic for wasm-ld.) - #85930 (Update standard library for IntoIterator implementation of arrays ) - #85972 (Rustdoc html fixes) - #86028 (Drop an `if let` that will always succeed) - #86043 (don't clone attrs) - #86047 (Don't fire `invalid_doc_attributes` on `extern crate` items) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src/array')
| -rw-r--r-- | library/core/src/array/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs index e25d006d213..37af3557fdd 100644 --- a/library/core/src/array/mod.rs +++ b/library/core/src/array/mod.rs @@ -416,7 +416,7 @@ impl<T, const N: usize> [T; N] { { // SAFETY: we know for certain that this iterator will yield exactly `N` // items. - unsafe { collect_into_array_unchecked(&mut IntoIter::new(self).map(f)) } + unsafe { collect_into_array_unchecked(&mut IntoIterator::into_iter(self).map(f)) } } /// 'Zips up' two arrays into a single array of pairs. @@ -437,7 +437,7 @@ impl<T, const N: usize> [T; N] { /// ``` #[unstable(feature = "array_zip", issue = "80094")] pub fn zip<U>(self, rhs: [U; N]) -> [(T, U); N] { - let mut iter = IntoIter::new(self).zip(IntoIter::new(rhs)); + let mut iter = IntoIterator::into_iter(self).zip(rhs); // SAFETY: we know for certain that this iterator will yield exactly `N` // items. |
