From da518823ff639954c3c47940c97a5a9edc3f5391 Mon Sep 17 00:00:00 2001 From: Oluwatobi Sofela <60105594+oluwatobiss@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:45:58 +0100 Subject: [PATCH] clippy: Fix op_ref warnings (#31900) --- components/script/dom/bindings/interface.rs | 4 ++-- components/script/dom/htmlformelement.rs | 6 +----- components/script/dom/htmlscriptelement.rs | 4 ++-- components/script/dom/mediastream.rs | 2 +- components/script/dom/node.rs | 2 +- components/script/dom/paintworkletglobalscope.rs | 12 ++++++------ components/script/dom/texttracklist.rs | 2 +- components/script/dom/xrsession.rs | 2 +- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index 1f05de74998..b9d78988d6d 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -638,7 +638,7 @@ pub fn get_desired_proto( // constructor. CheckedUnwrapStatic is fine here, because we're looking for // DOM constructors and those can't be cross-origin objects. *new_target = CheckedUnwrapStatic(*new_target); - if !new_target.is_null() && &*new_target != &*original_new_target { + if !new_target.is_null() && *new_target != *original_new_target { get_proto_id_for_new_target(new_target.handle()) } else { None @@ -649,7 +649,7 @@ pub fn get_desired_proto( let global = GetNonCCWObjectGlobal(*new_target); let proto_or_iface_cache = get_proto_or_iface_array(global); desired_proto.set((*proto_or_iface_cache)[proto_id as usize]); - if &*new_target != &*original_new_target && !JS_WrapObject(*cx, desired_proto.into()) { + if *new_target != *original_new_target && !JS_WrapObject(*cx, desired_proto.into()) { return Err(()); } return Ok(()); diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 01b349e7071..43f2f6df72b 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -597,11 +597,7 @@ impl HTMLFormElementMethods for HTMLFormElement { // Step 7-8 let mut names_vec: Vec = Vec::new(); for elem in sourced_names_vec.iter() { - if names_vec - .iter() - .find(|name| &**name == &*elem.name) - .is_none() - { + if names_vec.iter().find(|name| **name == *elem.name).is_none() { names_vec.push(DOMString::from(&*elem.name)); } } diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index b94adfacb61..a94272194ef 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -628,7 +628,7 @@ impl HTMLScriptElement { // Step 12. let doc = document_from_node(self); - if self.parser_inserted.get() && &*self.parser_document != &*doc { + if self.parser_inserted.get() && *self.parser_document != *doc { return; } @@ -983,7 +983,7 @@ impl HTMLScriptElement { pub fn execute(&self, result: ScriptResult) { // Step 1. let doc = document_from_node(self); - if self.parser_inserted.get() && &*doc != &*self.parser_document { + if self.parser_inserted.get() && *doc != *self.parser_document { return; } diff --git a/components/script/dom/mediastream.rs b/components/script/dom/mediastream.rs index a47b68f91d7..88375b7ede4 100644 --- a/components/script/dom/mediastream.rs +++ b/components/script/dom/mediastream.rs @@ -125,7 +125,7 @@ impl MediaStreamMethods for MediaStream { self.tracks .borrow() .iter() - .find(|x| x.id().id().to_string() == &*id) + .find(|x| x.id().id().to_string() == *id) .map(|x| DomRoot::from_ref(&**x)) } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index bfae1cf0c6f..cab2a68346d 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2018,7 +2018,7 @@ impl Node { suppress_observers: SuppressObserver, ) { node.owner_doc().add_script_and_layout_blocker(); - debug_assert!(&*node.owner_doc() == &*parent.owner_doc()); + debug_assert!(*node.owner_doc() == *parent.owner_doc()); debug_assert!(child.map_or(true, |child| Some(parent) == child.GetParentNode().as_deref())); diff --git a/components/script/dom/paintworkletglobalscope.rs b/components/script/dom/paintworkletglobalscope.rs index c6a182d956e..e1c05a77b5b 100644 --- a/components/script/dom/paintworkletglobalscope.rs +++ b/components/script/dom/paintworkletglobalscope.rs @@ -136,11 +136,11 @@ impl PaintWorkletGlobalScope { arguments, sender, ) => { - let cache_hit = (&*self.cached_name.borrow() == &name) && + let cache_hit = (*self.cached_name.borrow() == name) && (self.cached_size.get() == size) && (self.cached_device_pixel_ratio.get() == device_pixel_ratio) && - (&*self.cached_properties.borrow() == &properties) && - (&*self.cached_arguments.borrow() == &arguments); + (*self.cached_properties.borrow() == properties) && + (*self.cached_arguments.borrow() == arguments); let result = if cache_hit { debug!("Cache hit on paint worklet {}!", name); self.cached_result.borrow().clone() @@ -165,9 +165,9 @@ impl PaintWorkletGlobalScope { let _ = sender.send(result); }, PaintWorkletTask::SpeculativelyDrawAPaintImage(name, properties, arguments) => { - let should_speculate = (&*self.cached_name.borrow() != &name) || - (&*self.cached_properties.borrow() != &properties) || - (&*self.cached_arguments.borrow() != &arguments); + let should_speculate = (*self.cached_name.borrow() != name) || + (*self.cached_properties.borrow() != properties) || + (*self.cached_arguments.borrow() != arguments); if should_speculate { let size = self.cached_size.get(); let device_pixel_ratio = self.cached_device_pixel_ratio.get(); diff --git a/components/script/dom/texttracklist.rs b/components/script/dom/texttracklist.rs index 6924603384a..d2882fc389a 100644 --- a/components/script/dom/texttracklist.rs +++ b/components/script/dom/texttracklist.rs @@ -125,7 +125,7 @@ impl TextTrackListMethods for TextTrackList { self.dom_tracks .borrow() .iter() - .filter(|track| track.id() == &id_str) + .filter(|track| track.id() == id_str) .next() .map(|t| DomRoot::from_ref(&**t)) } diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs index effad1f8dea..b5015e7f374 100644 --- a/components/script/dom/xrsession.rs +++ b/components/script/dom/xrsession.rs @@ -784,7 +784,7 @@ impl XRSessionMethods for XRSession { .borrow() .granted_features() .iter() - .find(|f| &**f == s) + .find(|f| **f == s) .is_none() { p.reject_error(Error::NotSupported);