clippy: Fix many warnings in components/script (#31717)

* Fix Several clippy warnings * Fix Build errors * Fix Unused import * Fix requested changes * Fix rustfmt * Minor fixes --------- Co-authored-by: Martin Robinson <mrobinson@igalia.com>
servo · Mar 19, 2024 · 01ca220 · 01ca220
1 parent 676f655
commit 01ca220
Show file tree

Hide file tree

Showing 41 changed files with 200 additions and 212 deletions.
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs
@@ -370,15 +370,15 @@ impl CanvasState {
                     return Err(Error::InvalidState);
                 }
 
-                self.draw_html_canvas_element(&canvas, htmlcanvas, sx, sy, sw, sh, dx, dy, dw, dh)
+                self.draw_html_canvas_element(canvas, htmlcanvas, sx, sy, sw, sh, dx, dy, dw, dh)
             },
             CanvasImageSource::OffscreenCanvas(ref canvas) => {
                 // https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument
                 if !canvas.is_valid() {
                     return Err(Error::InvalidState);
                 }
 
-                self.draw_offscreen_canvas(&canvas, htmlcanvas, sx, sy, sw, sh, dx, dy, dw, dh)
+                self.draw_offscreen_canvas(canvas, htmlcanvas, sx, sy, sw, sh, dx, dy, dw, dh)
             },
             CanvasImageSource::HTMLImageElement(ref image) => {
                 // https://html.spec.whatwg.org/multipage/#drawing-images

diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs
@@ -502,7 +502,7 @@ impl ServoParser {
             if let Some(partial_bom) = bom_sniff.as_mut() {
                 if partial_bom.len() + chunk.len() >= 3 {
                     partial_bom.extend(chunk.iter().take(3 - partial_bom.len()).copied());
-                    if let Some((encoding, _)) = Encoding::for_bom(&partial_bom) {
+                    if let Some((encoding, _)) = Encoding::for_bom(partial_bom) {
                         self.document.set_encoding(encoding);
                     }
                     drop(bom_sniff);
@@ -568,7 +568,7 @@ impl ServoParser {
                 }
             }
         }
-        self.tokenize(|tokenizer| tokenizer.feed(&mut *self.network_input.borrow_mut()));
+        self.tokenize(|tokenizer| tokenizer.feed(&mut self.network_input.borrow_mut()));
 
         if self.suspended.get() {
             return;
@@ -606,7 +606,7 @@ impl ServoParser {
             assert!(!self.aborted.get());
 
             self.document.reflow_if_reflow_timer_expired();
-            let script = match feed(&mut *self.tokenizer.borrow_mut()) {
+            let script = match feed(&mut self.tokenizer.borrow_mut()) {
                 TokenizerResult::Done => return,
                 TokenizerResult::Script(script) => script,
             };
@@ -887,7 +887,7 @@ impl FetchResponseListener for ParserContext {
                     self.is_synthesized_document = true;
                     let page = resources::read_string(Resource::BadCertHTML);
                     let page = page.replace("${reason}", &reason);
-                    let encoded_bytes = general_purpose::STANDARD_NO_PAD.encode(&bytes);
+                    let encoded_bytes = general_purpose::STANDARD_NO_PAD.encode(bytes);
                     let page = page.replace("${bytes}", encoded_bytes.as_str());
                     let page =
                         page.replace("${secret}", &net_traits::PRIVILEGED_SECRET.to_string());
@@ -978,7 +978,7 @@ impl FetchResponseListener for ParserContext {
         if let Some(pushed_index) = self.pushed_entry_index {
             let document = &parser.document;
             let performance_entry =
-                PerformanceNavigationTiming::new(&document.global(), 0, 0, &document);
+                PerformanceNavigationTiming::new(&document.global(), 0, 0, document);
             document
                 .global()
                 .performance()
@@ -1008,7 +1008,7 @@ impl FetchResponseListener for ParserContext {
 
         //TODO nav_start and nav_start_precise
         let performance_entry =
-            PerformanceNavigationTiming::new(&document.global(), 0, 0, &document);
+            PerformanceNavigationTiming::new(&document.global(), 0, 0, document);
         self.pushed_entry_index = document
             .global()
             .performance()
@@ -1141,7 +1141,7 @@ impl TreeSink for Sink {
     }
 
     fn create_comment(&mut self, text: StrTendril) -> Dom<Node> {
-        let comment = Comment::new(DOMString::from(String::from(text)), &*self.document, None);
+        let comment = Comment::new(DOMString::from(String::from(text)), &self.document, None);
         Dom::from_ref(comment.upcast())
     }
 
@@ -1207,7 +1207,7 @@ impl TreeSink for Sink {
     }
 
     fn append(&mut self, parent: &Dom<Node>, child: NodeOrText<Dom<Node>>) {
-        insert(&parent, None, child, self.parsing_algorithm);
+        insert(parent, None, child, self.parsing_algorithm);
     }
 
     fn append_based_on_parent_node(
@@ -1276,7 +1276,7 @@ impl TreeSink for Sink {
 
     fn reparent_children(&mut self, node: &Dom<Node>, new_parent: &Dom<Node>) {
         while let Some(ref child) = node.GetFirstChild() {
-            new_parent.AppendChild(&child).unwrap();
+            new_parent.AppendChild(child).unwrap();
         }
     }
 

diff --git a/components/script/dom/shadowroot.rs b/components/script/dom/shadowroot.rs
@@ -78,10 +78,10 @@ impl ShadowRoot {
     }
 
     pub fn detach(&self) {
-        self.document.unregister_shadow_root(&self);
+        self.document.unregister_shadow_root(self);
         let node = self.upcast::<Node>();
         node.set_containing_shadow_root(None);
-        Node::complete_remove_subtree(&node, &UnbindContext::new(node, None, None, None));
+        Node::complete_remove_subtree(node, &UnbindContext::new(node, None, None, None));
         self.host.set(None);
     }
 
@@ -188,9 +188,7 @@ impl ShadowRootMethods for ShadowRoot {
         ) {
             Some(e) => {
                 let retargeted_node = self.upcast::<Node>().retarget(e.upcast::<Node>());
-                retargeted_node
-                    .downcast::<Element>()
-                    .map(|n| DomRoot::from_ref(n))
+                retargeted_node.downcast::<Element>().map(DomRoot::from_ref)
             },
             None => None,
         }
@@ -207,10 +205,7 @@ impl ShadowRootMethods for ShadowRoot {
             .iter()
         {
             let retargeted_node = self.upcast::<Node>().retarget(e.upcast::<Node>());
-            if let Some(element) = retargeted_node
-                .downcast::<Element>()
-                .map(|n| DomRoot::from_ref(n))
-            {
+            if let Some(element) = retargeted_node.downcast::<Element>().map(DomRoot::from_ref) {
                 elements.push(element);
             }
         }

diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
@@ -873,8 +873,8 @@ impl TestBindingMethods for TestBinding {
         prefs::pref_map()
             .get(pref_name.as_ref())
             .as_str()
-            .map(|s| DOMString::from(s))
-            .unwrap_or_else(|| DOMString::new())
+            .map(DOMString::from)
+            .unwrap_or_else(DOMString::new)
     }
     fn PrefControlledAttributeDisabled(&self) -> bool {
         false

diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs
@@ -89,7 +89,7 @@ impl TextMethods for Text {
             node.ranges()
                 .move_to_following_text_sibling_above(node, offset, new_node.upcast());
             // Steps 7.4-5.
-            parent.ranges().increment_at(&parent, node.index() + 1);
+            parent.ranges().increment_at(parent, node.index() + 1);
         }
         // Step 8.
         cdata.DeleteData(offset, count).unwrap();

diff --git a/components/script/dom/textcontrol.rs b/components/script/dom/textcontrol.rs
@@ -126,7 +126,7 @@ impl<'a, E: TextControlElement> TextControlSelection<'a, E> {
         self.set_range(
             Some(self.start()),
             Some(self.end()),
-            direction.map(|d| SelectionDirection::from(d)),
+            direction.map(SelectionDirection::from),
             None,
         );
         Ok(())
@@ -305,7 +305,7 @@ impl<'a, E: TextControlElement> TextControlSelection<'a, E> {
                 .task_manager()
                 .user_interaction_task_source()
                 .queue_event(
-                    &self.element.upcast::<EventTarget>(),
+                    self.element.upcast::<EventTarget>(),
                     atom!("select"),
                     EventBubbles::Bubbles,
                     EventCancelable::NotCancelable,

diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs
@@ -55,7 +55,7 @@ impl TextEncoderMethods for TextEncoder {
         let encoded = input.0.as_bytes();
 
         rooted!(in(*cx) let mut js_object = ptr::null_mut::<JSObject>());
-        create_buffer_source(cx, &encoded, js_object.handle_mut())
+        create_buffer_source(cx, encoded, js_object.handle_mut())
             .expect("Converting input to uint8 array should never fail")
     }
 }
diff --git a/components/script/dom/texttrack.rs b/components/script/dom/texttrack.rs
@@ -72,7 +72,7 @@ impl TextTrack {
 
     pub fn get_cues(&self) -> DomRoot<TextTrackCueList> {
         self.cue_list
-            .or_init(|| TextTrackCueList::new(&self.global().as_window(), &[]))
+            .or_init(|| TextTrackCueList::new(self.global().as_window(), &[]))
     }
 
     pub fn id(&self) -> &str {
@@ -131,7 +131,7 @@ impl TextTrackMethods for TextTrack {
     fn GetActiveCues(&self) -> Option<DomRoot<TextTrackCueList>> {
         // XXX implement active cues logic
         //      https://github.com/servo/servo/issues/22314
-        Some(TextTrackCueList::new(&self.global().as_window(), &[]))
+        Some(TextTrackCueList::new(self.global().as_window(), &[]))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-texttrack-addcue

diff --git a/components/script/dom/texttracklist.rs b/components/script/dom/texttracklist.rs
@@ -66,7 +66,7 @@ impl TextTrackList {
                 .task_manager()
                 .media_element_task_source_with_canceller();
 
-            let idx = match self.find(&track) {
+            let idx = match self.find(track) {
                 Some(t) => t,
                 None => return,
             };
@@ -89,7 +89,7 @@ impl TextTrackList {
                         event.upcast::<Event>().fire(this.upcast::<EventTarget>());
                     }
                 }),
-                &canceller,
+                canceller,
             );
             track.add_track_list(self);
         }

diff --git a/components/script/dom/trackevent.rs b/components/script/dom/trackevent.rs
@@ -78,7 +78,7 @@ impl TrackEvent {
         track: &Option<VideoTrackOrAudioTrackOrTextTrack>,
     ) -> DomRoot<TrackEvent> {
         let te = reflect_dom_object_with_proto(
-            Box::new(TrackEvent::new_inherited(&track)),
+            Box::new(TrackEvent::new_inherited(track)),
             global,
             proto,
         );

diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs
@@ -317,7 +317,7 @@ impl TreeWalker {
                             //     return null."
                             None => return Ok(None),
                             Some(ref parent)
-                                if self.is_root_node(&parent) || self.is_current_node(&parent) =>
+                                if self.is_root_node(parent) || self.is_current_node(parent) =>
                             {
                                 return Ok(None);
                             },
@@ -382,7 +382,7 @@ impl TreeWalker {
             match node.GetParentNode() {
                 // "4. If node is null or is root, return null."
                 None => return Ok(None),
-                Some(ref n) if self.is_root_node(&n) => return Ok(None),
+                Some(ref n) if self.is_root_node(n) => return Ok(None),
                 // "5. Filter node and if the return value is FILTER_ACCEPT, then return null."
                 Some(n) => {
                     node = n;

diff --git a/components/script/dom/userscripts.rs b/components/script/dom/userscripts.rs
@@ -31,7 +31,7 @@ pub fn load_script(head: &HTMLHeadElement) {
         rooted!(in(*cx) let mut rval = UndefinedValue());
 
         let path = PathBuf::from(&path_str);
-        let mut files = read_dir(&path)
+        let mut files = read_dir(path)
             .expect("Bad path passed to --userscripts")
             .filter_map(|e| e.ok())
             .map(|e| e.path())
@@ -52,7 +52,7 @@ pub fn load_script(head: &HTMLHeadElement) {
                 &file.to_string_lossy(),
                 rval.handle_mut(),
                 1,
-                ScriptFetchOptions::default_classic_script(&global),
+                ScriptFetchOptions::default_classic_script(global),
                 global.api_base_url(),
             );
         }

diff --git a/components/script/dom/vertexarrayobject.rs b/components/script/dom/vertexarrayobject.rs
@@ -71,7 +71,7 @@ impl VertexArrayObject {
     }
 
     pub fn ever_bound(&self) -> bool {
-        return self.ever_bound.get();
+        self.ever_bound.get()
     }
 
     pub fn set_ever_bound(&self) {

diff --git a/components/script/dom/videotrack.rs b/components/script/dom/videotrack.rs
@@ -35,12 +35,12 @@ impl VideoTrack {
     ) -> VideoTrack {
         VideoTrack {
             reflector_: Reflector::new(),
-            id: id.into(),
-            kind: kind.into(),
-            label: label.into(),
-            language: language.into(),
+            id,
+            kind,
+            label,
+            language,
             selected: Cell::new(false),
-            track_list: DomRefCell::new(track_list.map(|t| Dom::from_ref(t))),
+            track_list: DomRefCell::new(track_list.map(Dom::from_ref)),
         }
     }
 
@@ -69,7 +69,7 @@ impl VideoTrack {
     }
 
     pub fn selected(&self) -> bool {
-        self.selected.get().clone()
+        self.selected.get()
     }
 
     pub fn set_selected(&self, value: bool) {

diff --git a/components/script/dom/videotracklist.rs b/components/script/dom/videotracklist.rs
@@ -32,7 +32,7 @@ impl VideoTrackList {
         VideoTrackList {
             eventtarget: EventTarget::new_inherited(),
             tracks: DomRefCell::new(tracks.iter().map(|track| Dom::from_ref(&**track)).collect()),
-            media_element: media_element.map(|m| Dom::from_ref(m)),
+            media_element: media_element.map(Dom::from_ref),
         }
     }
 
@@ -149,7 +149,7 @@ impl VideoTrackListMethods for VideoTrackList {
         if let Some(idx) = self.selected_index() {
             return idx as i32;
         }
-        return -1;
+        -1
     }
 
     // https://html.spec.whatwg.org/multipage/#handler-tracklist-onchange