bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #87736 - the8472:inline-advance-by, r=Mark-Simulacrum

Browse source 
#[inline] slice::Iter::advance_by

https://github.com/rust-lang/rust/pull/87387#issuecomment-891942661 was marked as a regression. One of the methods in the PR was missing an inline annotation unlike all the other methods on slice iterators.

Let's see if that makes a difference.
This commit is contained in:
bors 2021-08-04 15:39:20 +00:00
commit 6fe0886723
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/core/src/slice/iter/macros.rs
View file

@ -185,8 +185,9 @@ macro_rules! iterator {
}
}
#[inline]
fn advance_by(&mut self, n: usize) -> Result<(), usize> {
let advance = cmp::min(n, len!(self));
let advance = cmp::min(len!(self), n);
// SAFETY: By construction, `advance` does not exceed `self.len()`.
unsafe { self.post_inc_start(advance as isize) };
if advance == n { Ok(()) } else { Err(advance) }
@ -381,7 +382,7 @@ macro_rules! iterator {
#[inline]
fn advance_back_by(&mut self, n: usize) -> Result<(), usize> {
let advance = cmp::min(n, len!(self));
let advance = cmp::min(len!(self), n);
// SAFETY: By construction, `advance` does not exceed `self.len()`.
unsafe { self.pre_dec_end(advance as isize) };
if advance == n { Ok(()) } else { Err(advance) }