Skip to content

Commit

Permalink
fix(allocator): fix lifetimes on IntoIterator for Vec (#8388)
Browse files Browse the repository at this point in the history
Lifetime on our impl of `IntoIterator` for `&Vec` was wrong.

Previously:

```rs
impl<'alloc, T> IntoIterator for &'alloc Vec<'alloc, T> {
    type IntoIter = std::slice::Iter<'alloc, T>;
    type Item = &'alloc T;
    fn into_iter(self) -> Self::IntoIter { self.0.iter() }
}
```

This means that the iterator borrows the `Vec` for the lifetime of the allocator, which is way too long. It should only borrow it for the lifetime of the reference `&Vec`. Insisting we borrow the `Vec` for so long to iterate over it was unnecessarily restrictive.

Instead:

```rs
impl<'i, T> IntoIterator for &'i Vec<'_, T> {
    type IntoIter = std::slice::Iter<'i, T>;
    type Item = &'i T;
    fn into_iter(self) -> Self::IntoIter { self.0.iter() }
}
```

This matches the lifetimes on [`allocator_api2::vec::Vec`'s implementation](https://github.com/zakarumych/allocator-api2/blob/63cd7fcc2f8854b5821c7054d026e8a4647acde1/src/stable/vec/mod.rs#L2682-L2690).
  • Loading branch information
overlookmotel committed Jan 9, 2025
1 parent b19d809 commit eb25bc0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions crates/oxc_allocator/src/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ impl<'alloc, T> IntoIterator for Vec<'alloc, T> {
}
}

impl<'alloc, T> IntoIterator for &'alloc Vec<'alloc, T> {
type IntoIter = std::slice::Iter<'alloc, T>;
type Item = &'alloc T;
impl<'i, T> IntoIterator for &'i Vec<'_, T> {
type IntoIter = std::slice::Iter<'i, T>;
type Item = &'i T;

fn into_iter(self) -> Self::IntoIter {
self.0.iter()
Expand Down

0 comments on commit eb25bc0

Please sign in to comment.