diff options
| author | bors <bors@rust-lang.org> | 2022-11-07 02:15:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-07 02:15:39 +0000 |
| commit | 9b735a7132acd58b3bd34c084e9ca5b4ca7450a2 (patch) | |
| tree | a551182bfce55b37e2ba49f98be4796bf1e94093 /library/alloc/src | |
| parent | 7eef946fc0e0eff40e588eab77b09b287accbec3 (diff) | |
| parent | 7ca833efe07a918f3ba89630da312d3fd6a85e01 (diff) | |
| download | rust-9b735a7132acd58b3bd34c084e9ca5b4ca7450a2.tar.gz rust-9b735a7132acd58b3bd34c084e9ca5b4ca7450a2.zip | |
Auto merge of #104083 - JohnTitor:rollup-lo3wbzs, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #103885 (rustdoc: various cross-crate reexport fixes) - #103914 (Make underscore_literal_suffix a hard error.) - #104045 (Add type_array to BaseTypeMethods) - #104056 (Vec: IntoIterator signature consistency) - #104059 (Fix typo in `rustc_middle/lint.rs`) - #104062 (rustdoc: remove unused CSS `#sidebar-filler`) - #104065 (Migrate rust logo filter to CSS variables) - #104066 (LLVM 16: Update RISCV data layout) - #104074 (rustdoc: Add an example for round that is different from truncate) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 834c8f58cb2..766006939fa 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -2780,7 +2780,7 @@ impl<T, A: Allocator> IntoIterator for Vec<T, A> { /// assert_eq!(v_iter.next(), None); /// ``` #[inline] - fn into_iter(self) -> IntoIter<T, A> { + fn into_iter(self) -> Self::IntoIter { unsafe { let mut me = ManuallyDrop::new(self); let alloc = ManuallyDrop::new(ptr::read(me.allocator())); @@ -2808,7 +2808,7 @@ impl<'a, T, A: Allocator> IntoIterator for &'a Vec<T, A> { type Item = &'a T; type IntoIter = slice::Iter<'a, T>; - fn into_iter(self) -> slice::Iter<'a, T> { + fn into_iter(self) -> Self::IntoIter { self.iter() } } @@ -2818,7 +2818,7 @@ impl<'a, T, A: Allocator> IntoIterator for &'a mut Vec<T, A> { type Item = &'a mut T; type IntoIter = slice::IterMut<'a, T>; - fn into_iter(self) -> slice::IterMut<'a, T> { + fn into_iter(self) -> Self::IntoIter { self.iter_mut() } } |
