nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 06:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

SplitInternal: always set finished in get_end

Browse Source
This commit is contained in:
Maybe Waffle 2022-04-04 16:45:09 +04:00
parent c5351ad4dc
commit ca4989eac2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/core/src/str/iter.rs
View File

@ -585,16 +585,17 @@ where
impl<'a, P: Pattern<'a>> SplitInternal<'a, P> {
#[inline]
fn get_end(&mut self) -> Option<&'a str> {
if !self.finished && (self.allow_trailing_empty || self.end - self.start > 0) {
if !self.finished {
self.finished = true;
// SAFETY: `self.start` and `self.end` always lie on unicode boundaries.
unsafe {
let string = self.matcher.haystack().get_unchecked(self.start..self.end);
Some(string)
if self.allow_trailing_empty || self.end - self.start > 0 {
// SAFETY: `self.start` and `self.end` always lie on unicode boundaries.
let string = unsafe { self.matcher.haystack().get_unchecked(self.start..self.end) };
return Some(string);
}
} else {
None
}
None
}
#[inline]