mirrors/hls_m3u8
1
0
Fork 0
mirror of https://github.com/sile/hls_m3u8.git synced 2024-12-22 20:16:27 +00:00
Code Issues Projects Releases Wiki Activity

Minor performance improvements in AttributePairs parsing

Browse source
This commit is contained in:
Luro02 2020-04-18 14:21:51 +02:00 committed by Lucas
parent ce04223ec4
commit 1a4813a1d1
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/attribute.rs
View file

@ -21,11 +21,10 @@ impl<'a> Iterator for AttributePairs<'a> {
// the position in the string:
let start = self.index;
// the key ends at an `=`:
let end = self
.string
let end = self.string[self.index..]
.char_indices()
.skip_while(|(i, _)| *i < self.index)
.find_map(|(i, c)| if c == '=' { Some(i) } else { None })?;
.find_map(|(i, c)| if c == '=' { Some(i) } else { None })?
+ self.index;
// advance the index to the char after the end of the key (to skip the `=`)
// NOTE: it is okay to add 1 to the index, because an `=` is exactly 1 byte.
@ -44,11 +43,7 @@ impl<'a> Iterator for AttributePairs<'a> {
let end = {
let mut result = self.string.len();
for (i, c) in self
.string
.char_indices()
.skip_while(|(i, _)| *i < self.index)
{
for (i, c) in self.string[self.index..].char_indices() {
// if a quote is encountered
if c == '"' {
// update variable
@ -60,7 +55,7 @@ impl<'a> Iterator for AttributePairs<'a> {
self.index += 1;
// the result is the index of the comma (comma is not included in the
// resulting string)
result = i;
result = i + self.index - 1;
break;
}
}
@ -74,7 +69,7 @@ impl<'a> Iterator for AttributePairs<'a> {
::core::str::from_utf8(&self.string.as_bytes()[start..end]).unwrap()
};
Some((key.trim(), value.trim()))
Some((key, value))
}
fn size_hint(&self) -> (usize, Option<usize>) {
@ -84,11 +79,7 @@ impl<'a> Iterator for AttributePairs<'a> {
// this also ignores `=` inside quotes!
let mut inside_quotes = false;
for (_, c) in self
.string
.char_indices()
.skip_while(|(i, _)| *i < self.index)
{
for (_, c) in self.string[self.index..].char_indices() {
if c == '=' && !inside_quotes {
remaining += 1;
} else if c == '"' {
@ -199,7 +190,7 @@ mod test {
assert_eq!((1, Some(1)), pairs.size_hint());
assert_eq!(
pairs.next(),
Some(("ध्वनि स्थिति और्४५० नीचे", "देखने लाभो द्वारा करके(विशेष"))
Some(("ध्वनि स्थिति और्४५० नीचे ", "देखने लाभो द्वारा करके(विशेष"))
);
assert_eq!((0, Some(0)), pairs.size_hint());