Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

clippy: Fix some warnings in components/script (#31735)

Browse source 
* fix clippy problems

* fix clippy error

* fix clippy error

* fix clippy error

* fix clippy error

* fix clippy error

* fix clippy errors
This commit is contained in:
Rosemary Ajayi 2024-03-19 08:01:23 +00:00 • committed by GitHub
parent 291fbce434
commit 06a021db55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 60 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/script/dom/mediafragmentparser.rs
View file

@ -114,8 +114,8 @@ impl MediaFragmentParser {
}
} else {
let mut iterator = fragment.split(',');
let start = parse_hms(iterator.next().ok_or_else(|| ())?)?;
let end = parse_hms(iterator.next().ok_or_else(|| ())?)?;
let start = parse_hms(iterator.next().ok_or(())?)?;
let end = parse_hms(iterator.next().ok_or(())?)?;
if iterator.next().is_some() || start >= end {
return Err(());
@ -150,8 +150,8 @@ impl MediaFragmentParser {
.flat_map(|s| parse_hms(&s.time().to_string()))
.collect();
let end = hms.pop().ok_or_else(|| ())?;
let start = hms.pop().ok_or_else(|| ())?;
let end = hms.pop().ok_or(())?;
let start = hms.pop().ok_or(())?;
if !hms.is_empty() || start >= end {
return Err(());
@ -168,10 +168,10 @@ impl MediaFragmentParser {
let mut clipping = SpatialClipping {
region: None,
x: queue.pop_front().ok_or_else(|| ())?,
y: queue.pop_front().ok_or_else(|| ())?,
width: queue.pop_front().ok_or_else(|| ())?,
height: queue.pop_front().ok_or_else(|| ())?,
x: queue.pop_front().ok_or(())?,
y: queue.pop_front().ok_or(())?,
width: queue.pop_front().ok_or(())?,
height: queue.pop_front().ok_or(())?,
};
if !queue.is_empty() {
@ -209,10 +209,7 @@ impl From<&ServoUrl> for MediaFragmentParser {
// 5.1.1 Processing name-value components.
fn decode_octets(bytes: &[u8]) -> Vec<(Cow<str>, Cow<str>)> {
form_urlencoded::parse(bytes)
.filter(|(key, _)| match key.as_bytes() {
b"t" | b"track" | b"id" | b"xywh" => true,
_ => false,
})
.filter(|(key, _)| matches!(key.as_bytes(), b"t" | b"track" | b"id" | b"xywh"))
.collect()
}
@ -239,10 +236,7 @@ fn split_url(s: &str) -> (&str, &str) {
}
fn is_byte_number(byte: u8) -> bool {
match byte {
48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 => true,
_ => false,
}
matches!(byte, 48..=57)
}
fn split_prefix(s: &str) -> (Option<&str>, &str) {
@ -320,13 +314,13 @@ fn parse_hms(s: &str) -> Result<f64, ()> {
},
2 => hms_to_seconds(
0,
parse_npt_minute(vec.pop_front().ok_or_else(|| ())?)?,
parse_npt_seconds(vec.pop_front().ok_or_else(|| ())?)?,
parse_npt_minute(vec.pop_front().ok_or(())?)?,
parse_npt_seconds(vec.pop_front().ok_or(())?)?,
),
3 => hms_to_seconds(
vec.pop_front().ok_or_else(|| ())?.parse().map_err(|_| ())?,
parse_npt_minute(vec.pop_front().ok_or_else(|| ())?)?,
parse_npt_seconds(vec.pop_front().ok_or_else(|| ())?)?,
parse_npt_minute(vec.pop_front().ok_or(())?)?,
parse_npt_seconds(vec.pop_front().ok_or(())?)?,
),
_ => return Err(()),
};