From 7ce78f5a74f59ed8a23393a1efcfd26f5264ff17 Mon Sep 17 00:00:00 2001 From: Ekta Siwach <137225906+ektuu@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:27:25 +0530 Subject: clippy: Fix some warnings in `script/dom` (#31915) * fixed some clippy warnings * resolved conflict * updated texttracklist.rs --------- Co-authored-by: Martin Robinson --- components/script/dom/texttrack.rs | 2 +- components/script/dom/texttrackcuelist.rs | 6 ++---- components/script/dom/texttracklist.rs | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'components/script/dom') diff --git a/components/script/dom/texttrack.rs b/components/script/dom/texttrack.rs index e0263e5ee1a..390f5388962 100644 --- a/components/script/dom/texttrack.rs +++ b/components/script/dom/texttrack.rs @@ -142,7 +142,7 @@ impl TextTrackMethods for TextTrack { // gecko calls RemoveCue when the given cue // has an associated track, but doesn't return // the error from it, so we wont either. - if let Err(_) = old_track.RemoveCue(cue) { + if old_track.RemoveCue(cue).is_err() { warn!("Failed to remove cues for the added cue's text track"); } } diff --git a/components/script/dom/texttrackcuelist.rs b/components/script/dom/texttrackcuelist.rs index 912faff815a..6c7e01e9c38 100644 --- a/components/script/dom/texttrackcuelist.rs +++ b/components/script/dom/texttrackcuelist.rs @@ -42,8 +42,7 @@ impl TextTrackCueList { .borrow() .iter() .enumerate() - .filter(|(_, c)| **c == cue) - .next() + .find(|(_, c)| **c == cue) .map(|(i, _)| i) } @@ -78,8 +77,7 @@ impl TextTrackCueListMethods for TextTrackCueList { self.dom_cues .borrow() .iter() - .filter(|cue| cue.id() == id) - .next() + .find(|cue| cue.id() == id) .map(|t| DomRoot::from_ref(&**t)) } } diff --git a/components/script/dom/texttracklist.rs b/components/script/dom/texttracklist.rs index d2882fc389a..d492b07a9be 100644 --- a/components/script/dom/texttracklist.rs +++ b/components/script/dom/texttracklist.rs @@ -49,8 +49,7 @@ impl TextTrackList { .borrow() .iter() .enumerate() - .filter(|(_, t)| **t == track) - .next() + .find(|(_, t)| **t == track) .map(|(i, _)| i) } @@ -125,8 +124,7 @@ impl TextTrackListMethods for TextTrackList { self.dom_tracks .borrow() .iter() - .filter(|track| track.id() == id_str) - .next() + .find(|track| track.id() == id_str) .map(|t| DomRoot::from_ref(&**t)) } -- cgit v1.2.3