From 3c05b58221a2b5c879d31d355087a905de6494d8 Mon Sep 17 00:00:00 2001 From: Oluwatobi Sofela <60105594+oluwatobiss@users.noreply.github.com> Date: Sat, 23 Mar 2024 12:29:20 +0100 Subject: [PATCH] clippy: Fix `explicit_auto_deref` warnings in `components/script` (#31837) * clippy: Fix explicit auto-deref warnings * clippy: Fix explicit auto-deref warnings * refactor: Tidy up code * refactor: Fix method not found errors --- components/script/body.rs | 2 +- components/script/devtools.rs | 6 ++--- components/script/dom/attr.rs | 2 +- .../script/dom/bindings/htmlconstructor.rs | 8 +++---- .../script/dom/bindings/proxyhandler.rs | 2 +- components/script/dom/blob.rs | 2 +- components/script/dom/bluetoothuuid.rs | 2 +- components/script/dom/broadcastchannel.rs | 2 +- .../script/dom/canvasrenderingcontext2d.rs | 2 +- components/script/dom/characterdata.rs | 2 +- components/script/dom/compositionevent.rs | 2 +- components/script/dom/create.rs | 10 ++++---- components/script/dom/cssrulelist.rs | 2 +- components/script/dom/cssstylerule.rs | 2 +- components/script/dom/cssstylevalue.rs | 4 ++-- .../script/dom/customelementregistry.rs | 2 +- components/script/dom/document.rs | 15 ++++++------ components/script/dom/domparser.rs | 2 +- components/script/dom/domquad.rs | 16 ++++++------- components/script/dom/element.rs | 22 ++++++++--------- components/script/dom/eventsource.rs | 4 ++-- components/script/dom/formdataevent.rs | 2 +- components/script/dom/globalscope.rs | 10 ++++---- components/script/dom/gpubuffer.rs | 2 +- components/script/dom/gpudevice.rs | 4 ++-- components/script/dom/headers.rs | 2 +- components/script/dom/history.rs | 2 +- components/script/dom/htmlcanvaselement.rs | 4 ++-- components/script/dom/htmlcollection.rs | 2 +- .../script/dom/htmlformcontrolscollection.rs | 4 ++-- components/script/dom/htmlformelement.rs | 6 ++--- components/script/dom/htmlmediaelement.rs | 6 ++--- components/script/dom/htmlscriptelement.rs | 6 ++--- components/script/dom/htmltableelement.rs | 6 ++--- components/script/dom/htmlvideoelement.rs | 2 +- .../script/dom/mediaelementaudiosourcenode.rs | 4 ++-- components/script/dom/messagechannel.rs | 6 ++--- components/script/dom/messageport.rs | 4 ++-- components/script/dom/mutationobserver.rs | 4 ++-- components/script/dom/node.rs | 24 +++++++++---------- .../script/dom/paintworkletglobalscope.rs | 22 +++++------------ components/script/dom/performanceobserver.rs | 4 ++-- components/script/dom/promise.rs | 2 +- components/script/dom/range.rs | 6 ++--- components/script/dom/readablestream.rs | 2 +- components/script/dom/rtcdatachannel.rs | 2 +- components/script/dom/selection.rs | 16 ++++++------- .../script/dom/serviceworkercontainer.rs | 4 ++-- .../script/dom/servoparser/async_html.rs | 4 ++-- components/script/dom/servoparser/html.rs | 2 +- components/script/dom/servoparser/mod.rs | 4 ++-- components/script/dom/servoparser/prefetch.rs | 2 +- components/script/dom/testworklet.rs | 2 +- .../script/dom/webglrenderingcontext.rs | 4 ++-- components/script/dom/windowproxy.rs | 8 +++---- components/script/dom/worklet.rs | 2 +- components/script/dom/xmlhttprequest.rs | 2 +- .../script/dom/xrinputsourceschangeevent.rs | 4 ++-- components/script/dom/xrrenderstate.rs | 2 +- components/script/dom/xrsession.rs | 6 ++--- components/script/script_module.rs | 10 ++++---- components/script/script_thread.rs | 4 ++-- 62 files changed, 157 insertions(+), 168 deletions(-) diff --git a/components/script/body.rs b/components/script/body.rs index e585c1287c5..bad9c86d446 100644 --- a/components/script/body.rs +++ b/components/script/body.rs @@ -685,7 +685,7 @@ impl Callback for ConsumeBodyPromiseHandler { .expect("No bytes for ConsumeBodyPromiseHandler."); // Append the value property to bytes. - bytes.extend_from_slice(&*chunk); + bytes.extend_from_slice(&chunk); let global = stream.global(); diff --git a/components/script/devtools.rs b/components/script/devtools.rs index 1c2498eb861..bd15db39712 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -122,7 +122,7 @@ pub fn handle_get_children( node_id: String, reply: IpcSender>>, ) { - match find_node_by_unique_id(documents, pipeline, &*node_id) { + match find_node_by_unique_id(documents, pipeline, &node_id) { None => return reply.send(None).unwrap(), Some(parent) => { let children = parent.children().map(|child| child.summarize()).collect(); @@ -138,7 +138,7 @@ pub fn handle_get_layout( node_id: String, reply: IpcSender>, ) { - let node = match find_node_by_unique_id(documents, pipeline, &*node_id) { + let node = match find_node_by_unique_id(documents, pipeline, &node_id) { None => return reply.send(None).unwrap(), Some(found_node) => found_node, }; @@ -198,7 +198,7 @@ pub fn handle_modify_attribute( node_id: String, modifications: Vec, ) { - let node = match find_node_by_unique_id(documents, pipeline, &*node_id) { + let node = match find_node_by_unique_id(documents, pipeline, &node_id) { None => { return warn!( "node id {} for pipeline id {} is not found", diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 03feb23fbae..0096942ba9a 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -255,7 +255,7 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> { #[inline] fn as_str(self) -> &'dom str { - &**self.value() + self.value() } #[inline] diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs index 6ed725d3720..111f78751d7 100644 --- a/components/script/dom/bindings/htmlconstructor.rs +++ b/components/script/dom/bindings/htmlconstructor.rs @@ -156,12 +156,12 @@ unsafe fn html_constructor( // Any prototype used to create these elements will be overwritten before returning // from this function, so we don't bother overwriting the defaults here. let element = if definition.is_autonomous() { - DomRoot::upcast(HTMLElement::new(name.local, None, &*document, None)) + DomRoot::upcast(HTMLElement::new(name.local, None, &document, None)) } else { create_native_html_element( name, None, - &*document, + &document, ElementCreator::ScriptCreated, None, ) @@ -176,7 +176,7 @@ unsafe fn html_constructor( element.set_custom_element_definition(definition.clone()); // Step 8.5 - if !check_type(&*element) { + if !check_type(&element) { throw_dom_exception(cx, global, Error::InvalidState); return Err(()); } else { @@ -193,7 +193,7 @@ unsafe fn html_constructor( construction_stack.push(ConstructionStackEntry::AlreadyConstructedMarker); // Step 13 - if !check_type(&*element) { + if !check_type(&element) { throw_dom_exception(cx, global, Error::InvalidState); return Err(()); } else { diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index 715896fe70d..632959e4e5e 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -246,7 +246,7 @@ pub unsafe fn report_cross_origin_denial(cx: SafeJSContext, id: RawHandleId, acc if !JS_IsExceptionPending(*cx) { let global = GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof)); // TODO: include `id` and `access` in the exception message - throw_dom_exception(cx, &*global, Error::Security); + throw_dom_exception(cx, &global, Error::Security); } false } diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 61903d5753e..e5b4f8e117d 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -246,7 +246,7 @@ impl BlobMethods for Blob { normalize_type_string(&content_type.unwrap_or(DOMString::from("")).to_string()); let rel_pos = RelativePos::from_opts(start, end); let blob_impl = BlobImpl::new_sliced(rel_pos, self.blob_id.clone(), type_string); - Blob::new(&*self.global(), blob_impl) + Blob::new(&self.global(), blob_impl) } // https://w3c.github.io/FileAPI/#text-method-algo diff --git a/components/script/dom/bluetoothuuid.rs b/components/script/dom/bluetoothuuid.rs index 9d5f1e4bcbb..07156684fdc 100644 --- a/components/script/dom/bluetoothuuid.rs +++ b/components/script/dom/bluetoothuuid.rs @@ -649,7 +649,7 @@ fn resolve_uuid_name( StringOrUnsignedLong::String(dstring) => { // Step 2. let regex = Regex::new(VALID_UUID_REGEX).unwrap(); - if regex.is_match(&*dstring) { + if regex.is_match(&dstring) { Ok(dstring) } else { // Step 3. diff --git a/components/script/dom/broadcastchannel.rs b/components/script/dom/broadcastchannel.rs index 0140836fade..7f4063ab315 100644 --- a/components/script/dom/broadcastchannel.rs +++ b/components/script/dom/broadcastchannel.rs @@ -49,7 +49,7 @@ impl BroadcastChannel { global, proto, ); - global.track_broadcast_channel(&*channel); + global.track_broadcast_channel(&channel); channel } diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index b4035bfc7bb..8870c38b5ce 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -141,7 +141,7 @@ pub trait LayoutCanvasRenderingContext2DHelpers { impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<'_, CanvasRenderingContext2D> { #[allow(unsafe_code)] unsafe fn get_ipc_renderer(self) -> IpcSender { - (*self.unsafe_get()).canvas_state.get_ipc_renderer().clone() + (self.unsafe_get()).canvas_state.get_ipc_renderer().clone() } #[allow(unsafe_code)] diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index f315e3303bf..0de4f22d09a 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -163,7 +163,7 @@ impl CharacterDataMethods for CharacterData { // https://dom.spec.whatwg.org/#dom-characterdata-appenddatadata fn AppendData(&self, data: DOMString) { // FIXME(ajeffrey): Efficient append on DOMStrings? - self.append_data(&*data); + self.append_data(&data); } // https://dom.spec.whatwg.org/#dom-characterdata-insertdataoffset-data diff --git a/components/script/dom/compositionevent.rs b/components/script/dom/compositionevent.rs index 360605bbc57..2f4cc05943b 100644 --- a/components/script/dom/compositionevent.rs +++ b/components/script/dom/compositionevent.rs @@ -92,7 +92,7 @@ impl CompositionEvent { } pub fn data(&self) -> &str { - &*self.data + &self.data } } diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index d97ad1add04..771f19189f2 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -144,7 +144,7 @@ fn create_html_element( proto, )); result.set_custom_element_state(CustomElementState::Undefined); - ScriptThread::enqueue_upgrade_reaction(&*result, definition); + ScriptThread::enqueue_upgrade_reaction(&result, definition); return result; }, CustomElementCreationMode::Synchronous => { @@ -185,10 +185,10 @@ fn create_html_element( element.set_custom_element_state(CustomElementState::Undefined); match mode { // Step 5.3 - CustomElementCreationMode::Synchronous => upgrade_element(definition, &*element), + CustomElementCreationMode::Synchronous => upgrade_element(definition, &element), // Step 5.4 CustomElementCreationMode::Asynchronous => { - ScriptThread::enqueue_upgrade_reaction(&*element, definition) + ScriptThread::enqueue_upgrade_reaction(&element, definition) }, } return element; @@ -203,7 +203,7 @@ fn create_html_element( result.set_custom_element_state(CustomElementState::Undefined); }, None => { - if is_valid_custom_element_name(&*name.local) { + if is_valid_custom_element_name(&name.local) { result.set_custom_element_state(CustomElementState::Undefined); } else { result.set_custom_element_state(CustomElementState::Uncustomized); @@ -383,7 +383,7 @@ pub fn create_native_html_element( local_name!("video") => make!(HTMLVideoElement), local_name!("wbr") => make!(HTMLElement), local_name!("xmp") => make!(HTMLPreElement), - _ if is_valid_custom_element_name(&*name.local) => make!(HTMLElement), + _ if is_valid_custom_element_name(&name.local) => make!(HTMLElement), _ => make!(HTMLUnknownElement), } } diff --git a/components/script/dom/cssrulelist.rs b/components/script/dom/cssrulelist.rs index 4c14357b36d..310a502df70 100644 --- a/components/script/dom/cssrulelist.rs +++ b/components/script/dom/cssrulelist.rs @@ -116,7 +116,7 @@ impl CSSRuleList { .flatten(); let loader = owner .as_ref() - .map(|element| StylesheetLoader::for_element(&**element)); + .map(|element| StylesheetLoader::for_element(element)); let new_rule = css_rules.insert_rule( &parent_stylesheet.shared_lock, rule, diff --git a/components/script/dom/cssstylerule.rs b/components/script/dom/cssstylerule.rs index 6a029cb8331..67c6e6ddb10 100644 --- a/components/script/dom/cssstylerule.rs +++ b/components/script/dom/cssstylerule.rs @@ -109,7 +109,7 @@ impl CSSStyleRuleMethods for CSSStyleRule { url_data: &url_data, for_supports_rule: false, }; - let mut css_parser = CssParserInput::new(&*value); + let mut css_parser = CssParserInput::new(&value); let mut css_parser = CssParser::new(&mut css_parser); // TODO: Maybe allow setting relative selectors from the OM, if we're in a nested style // rule? diff --git a/components/script/dom/cssstylevalue.rs b/components/script/dom/cssstylevalue.rs index 7f8e580ddbb..e65e929e520 100644 --- a/components/script/dom/cssstylevalue.rs +++ b/components/script/dom/cssstylevalue.rs @@ -44,11 +44,11 @@ impl CSSStyleValue { /// return relative URLs for computed values, so we pass in a base. /// pub fn get_url(&self, base_url: ServoUrl) -> Option { - let mut input = ParserInput::new(&*self.value); + let mut input = ParserInput::new(&self.value); let mut parser = Parser::new(&mut input); parser .expect_url() .ok() - .and_then(|string| base_url.join(&*string).ok()) + .and_then(|string| base_url.join(&string).ok()) } } diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index 76acb9e2014..5ad67e237bf 100644 --- a/components/script/dom/customelementregistry.rs +++ b/components/script/dom/customelementregistry.rs @@ -391,7 +391,7 @@ impl CustomElementRegistryMethods for CustomElementRegistry { *candidate.namespace() == ns!(html) && (extends.is_none() || is.as_ref() == Some(&name)) { - ScriptThread::enqueue_upgrade_reaction(&*candidate, definition.clone()); + ScriptThread::enqueue_upgrade_reaction(&candidate, definition.clone()); } } diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 62ead49cb77..e6b7d07941e 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -636,7 +636,7 @@ impl Document { #[inline] pub fn window(&self) -> &Window { - &*self.window + &self.window } #[inline] @@ -2959,12 +2959,12 @@ impl<'dom> LayoutDocumentHelpers<'dom> for LayoutDom<'dom, Document> { #[inline] unsafe fn needs_paint_from_layout(self) { - (*self.unsafe_get()).needs_paint.set(true) + (self.unsafe_get()).needs_paint.set(true) } #[inline] unsafe fn will_paint(self) { - (*self.unsafe_get()).needs_paint.set(false) + (self.unsafe_get()).needs_paint.set(false) } #[inline] @@ -3306,7 +3306,7 @@ impl Document { proto: Option, ) -> Fallible> { let doc = window.Document(); - let docloader = DocumentLoader::new(&*doc.loader()); + let docloader = DocumentLoader::new(&doc.loader()); Ok(Document::new_with_proto( window, proto, @@ -4095,8 +4095,7 @@ impl DocumentMethods for Document { }; // Step 5 - let host = match get_registrable_domain_suffix_of_or_is_equal_to(&*value, effective_domain) - { + let host = match get_registrable_domain_suffix_of_or_is_equal_to(&value, effective_domain) { None => return Err(Error::Security), Some(host) => host, }; @@ -4946,7 +4945,7 @@ impl DocumentMethods for Document { let mut names_with_first_named_element_map: HashMap<&Atom, &Element> = HashMap::new(); let name_map = self.name_map.borrow(); - for (name, elements) in &(*name_map).0 { + for (name, elements) in &(name_map).0 { if name.is_empty() { continue; } @@ -4958,7 +4957,7 @@ impl DocumentMethods for Document { } } let id_map = self.id_map.borrow(); - for (id, elements) in &(*id_map).0 { + for (id, elements) in &(id_map).0 { if id.is_empty() { continue; } diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 470a49968a3..6283514afe1 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -62,7 +62,7 @@ impl DOMParserMethods for DOMParser { .parse() .expect("Supported type is not a MIME type"); let doc = self.window.Document(); - let loader = DocumentLoader::new(&*doc.loader()); + let loader = DocumentLoader::new(&doc.loader()); match ty { Text_html => { let document = Document::new( diff --git a/components/script/dom/domquad.rs b/components/script/dom/domquad.rs index ce824911eb2..0a26eaaf3c1 100644 --- a/components/script/dom/domquad.rs +++ b/components/script/dom/domquad.rs @@ -73,10 +73,10 @@ impl DOMQuad { Ok(DOMQuad::new_with_proto( global, proto, - &*DOMPoint::new_from_init(global, p1), - &*DOMPoint::new_from_init(global, p2), - &*DOMPoint::new_from_init(global, p3), - &*DOMPoint::new_from_init(global, p4), + &DOMPoint::new_from_init(global, p1), + &DOMPoint::new_from_init(global, p2), + &DOMPoint::new_from_init(global, p3), + &DOMPoint::new_from_init(global, p4), )) } @@ -84,16 +84,16 @@ impl DOMQuad { pub fn FromRect(global: &GlobalScope, other: &DOMRectInit) -> DomRoot { DOMQuad::new( global, - &*DOMPoint::new(global, other.x, other.y, 0f64, 1f64), - &*DOMPoint::new(global, other.x + other.width, other.y, 0f64, 1f64), - &*DOMPoint::new( + &DOMPoint::new(global, other.x, other.y, 0f64, 1f64), + &DOMPoint::new(global, other.x + other.width, other.y, 0f64, 1f64), + &DOMPoint::new( global, other.x + other.width, other.y + other.height, 0f64, 1f64, ), - &*DOMPoint::new(global, other.x, other.y + other.height, 0f64, 1f64), + &DOMPoint::new(global, other.x, other.y + other.height, 0f64, 1f64), ) } diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 8ca93346f89..c008230cd88 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -535,14 +535,14 @@ impl Element { } // Steps 4, 5 and 6. - let shadow_root = ShadowRoot::new(self, &*self.node.owner_doc()); + let shadow_root = ShadowRoot::new(self, &self.node.owner_doc()); self.ensure_rare_data().shadow_root = Some(Dom::from_ref(&*shadow_root)); shadow_root .upcast::() .set_containing_shadow_root(Some(&shadow_root)); if self.is_connected() { - self.node.owner_doc().register_shadow_root(&*shadow_root); + self.node.owner_doc().register_shadow_root(&shadow_root); } self.upcast::().dirty(NodeDamage::OtherNodeDamage); @@ -1047,22 +1047,22 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { #[allow(unsafe_code)] fn id_attribute(self) -> *const Option { - unsafe { (*self.unsafe_get()).id_attribute.borrow_for_layout() } + unsafe { (self.unsafe_get()).id_attribute.borrow_for_layout() } } #[allow(unsafe_code)] fn style_attribute(self) -> *const Option>> { - unsafe { (*self.unsafe_get()).style_attribute.borrow_for_layout() } + unsafe { (self.unsafe_get()).style_attribute.borrow_for_layout() } } #[allow(unsafe_code)] fn local_name(self) -> &'dom LocalName { - unsafe { &(*self.unsafe_get()).local_name } + unsafe { &(self.unsafe_get()).local_name } } #[allow(unsafe_code)] fn namespace(self) -> &'dom Namespace { - unsafe { &(*self.unsafe_get()).namespace } + unsafe { &(self.unsafe_get()).namespace } } fn get_lang_for_layout(self) -> String { @@ -1091,7 +1091,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { #[inline] #[allow(unsafe_code)] fn get_state_for_layout(self) -> ElementState { - unsafe { (*self.unsafe_get()).state.get() } + unsafe { (self.unsafe_get()).state.get() } } #[inline] @@ -1099,7 +1099,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { fn insert_selector_flags(self, flags: ElementSelectorFlags) { debug_assert!(thread_state::get().is_layout()); unsafe { - let f = &(*self.unsafe_get()).selector_flags; + let f = &(self.unsafe_get()).selector_flags; f.set(f.get() | flags); } } @@ -1107,7 +1107,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { #[inline] #[allow(unsafe_code)] fn has_selector_flags(self, flags: ElementSelectorFlags) -> bool { - unsafe { (*self.unsafe_get()).selector_flags.get().contains(flags) } + unsafe { (self.unsafe_get()).selector_flags.get().contains(flags) } } #[inline] @@ -3305,7 +3305,7 @@ impl<'a> SelectorsElement for DomRoot { // a string containing commas (separating each language tag in // a list) but the pseudo-class instead should be parsing and // storing separate or s for each language tag. - NonTSPseudoClass::Lang(ref lang) => extended_filtering(&*self.get_lang(), &*lang), + NonTSPseudoClass::Lang(ref lang) => extended_filtering(&self.get_lang(), lang), NonTSPseudoClass::ReadOnly => !Element::state(self).contains(pseudo_class.state_flag()), @@ -3358,7 +3358,7 @@ impl<'a> SelectorsElement for DomRoot { } fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool { - Element::has_class(&**self, name, case_sensitivity) + Element::has_class(self, name, case_sensitivity) } fn is_html_element_in_html_document(&self) -> bool { diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index f652951f8b6..29186846d2a 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -234,7 +234,7 @@ impl EventSourceContext { .to_jsval(*GlobalScope::get_cx(), data.handle_mut()) }; MessageEvent::new( - &*event_source.global(), + &event_source.global(), type_, false, false, @@ -520,7 +520,7 @@ impl EventSource { // TODO: Step 2 relevant settings object // Step 3 let base_url = global.api_base_url(); - let url_record = match base_url.join(&*url) { + let url_record = match base_url.join(&url) { Ok(u) => u, // Step 4 Err(_) => return Err(Error::Syntax), diff --git a/components/script/dom/formdataevent.rs b/components/script/dom/formdataevent.rs index 6a3317a9092..9d8c6e34f32 100644 --- a/components/script/dom/formdataevent.rs +++ b/components/script/dom/formdataevent.rs @@ -76,7 +76,7 @@ impl FormDataEvent { Atom::from(type_), bubbles, cancelable, - &*init.formData.clone(), + &init.formData.clone(), ); Ok(event) diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index f0029bdf3d3..b571657494d 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -630,7 +630,7 @@ impl FileListener { let task = task!(enqueue_stream_chunk: move || { let stream = trusted.root(); - stream_handle_incoming(&*stream, Ok(blob_buf.bytes)); + stream_handle_incoming(&stream, Ok(blob_buf.bytes)); }); let _ = self @@ -654,7 +654,7 @@ impl FileListener { let task = task!(enqueue_stream_chunk: move || { let stream = trusted.root(); - stream_handle_incoming(&*stream, Ok(bytes_in)); + stream_handle_incoming(&stream, Ok(bytes_in)); }); let _ = self @@ -692,7 +692,7 @@ impl FileListener { let task = task!(enqueue_stream_chunk: move || { let stream = trusted.root(); - stream_handle_eof(&*stream); + stream_handle_eof(&stream); }); let _ = self @@ -728,7 +728,7 @@ impl FileListener { let _ = self.task_source.queue_with_canceller( task!(error_stream: move || { let stream = trusted_stream.root(); - stream_handle_incoming(&*stream, error); + stream_handle_incoming(&stream, error); }), &self.task_canceller, ); @@ -875,7 +875,7 @@ impl GlobalScope { // Step 2.6 if let Some(worker_id) = installing_worker { let worker = self.get_serviceworker(script_url, scope, worker_id); - new_registration.set_installing(&*worker); + new_registration.set_installing(&worker); } // TODO: 2.7 (waiting worker) diff --git a/components/script/dom/gpubuffer.rs b/components/script/dom/gpubuffer.rs index 10ced4a654e..7cdffaa7292 100644 --- a/components/script/dom/gpubuffer.rs +++ b/components/script/dom/gpubuffer.rs @@ -159,7 +159,7 @@ impl GPUBufferMethods for GPUBuffer { WebGPURequest::UnmapBuffer { buffer_id: self.id().0, device_id: self.device.id().0, - array_buffer: IpcSharedMemory::from_bytes(&*m_info.mapping.lock().unwrap()), + array_buffer: IpcSharedMemory::from_bytes(&m_info.mapping.lock().unwrap()), is_map_read: m_info.map_mode == Some(GPUMapModeConstants::READ), offset: m_range.start, size: m_range.end - m_range.start, diff --git a/components/script/dom/gpudevice.rs b/components/script/dom/gpudevice.rs index 4af10e5001c..c843404648a 100644 --- a/components/script/dom/gpudevice.rs +++ b/components/script/dom/gpudevice.rs @@ -164,7 +164,7 @@ impl GPUDevice { )), global, ); - queue.set_device(&*device); + queue.set_device(&device); device } } @@ -653,7 +653,7 @@ impl GPUDeviceMethods for GPUDevice { &self.global(), bind_group, self.device, - &*descriptor.layout, + &descriptor.layout, descriptor.parent.label.clone().unwrap_or_default(), ) } diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs index 11363e07638..3b966d1551b 100644 --- a/components/script/dom/headers.rs +++ b/components/script/dom/headers.rs @@ -290,7 +290,7 @@ impl Headers { // https://fetch.spec.whatwg.org/#concept-header-extract-mime-type pub fn extract_mime_type(&self) -> Vec { - extract_mime_type(&*self.header_list.borrow()).unwrap_or(vec![]) + extract_mime_type(&self.header_list.borrow()).unwrap_or(vec![]) } // https://fetch.spec.whatwg.org/#concept-header-list-sort-and-combine diff --git a/components/script/dom/history.rs b/components/script/dom/history.rs index c658b162216..c996cf87ccd 100644 --- a/components/script/dom/history.rs +++ b/components/script/dom/history.rs @@ -136,7 +136,7 @@ impl History { if state_changed { PopStateEvent::dispatch_jsval( self.window.upcast::(), - &*self.window, + &self.window, unsafe { HandleValue::from_raw(self.state.handle()) }, ); } diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index b2557b4783b..dce5fd0ea5e 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -439,8 +439,8 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement { /// fn CaptureStream(&self, _frame_request_rate: Option>) -> DomRoot { let global = self.global(); - let stream = MediaStream::new(&*global); - let track = MediaStreamTrack::new(&*global, MediaStreamId::new(), MediaStreamType::Video); + let stream = MediaStream::new(&global); + let track = MediaStreamTrack::new(&global, MediaStreamId::new(), MediaStreamType::Video); stream.AddTrack(&track); stream } diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 336363c30a4..5a01e5be773 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -297,7 +297,7 @@ impl HTMLCollection { pub fn elements_iter<'a>(&'a self) -> impl Iterator> + 'a { // Iterate forwards from the root. - self.elements_iter_after(&*self.root) + self.elements_iter_after(&self.root) } pub fn elements_iter_before<'a>( diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs index 098ddf55465..d02ff962213 100644 --- a/components/script/dom/htmlformcontrolscollection.rs +++ b/components/script/dom/htmlformcontrolscollection.rs @@ -35,7 +35,7 @@ impl HTMLFormControlsCollection { .upcast::() .GetRootNode(&GetRootNodeOptions::empty()); HTMLFormControlsCollection { - collection: HTMLCollection::new_inherited(&*root_of_form, filter), + collection: HTMLCollection::new_inherited(&root_of_form, filter), form: Dom::from_ref(form), } } @@ -92,7 +92,7 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection { // specifically HTMLFormElement::Elements(), // and the collection filter excludes image inputs. Some(RadioNodeListOrElement::RadioNodeList( - RadioNodeList::new_controls_except_image_inputs(window, &*self.form, &name), + RadioNodeList::new_controls_except_image_inputs(window, &self.form, &name), )) } // Step 3 diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 4793f5a6af7..a9c5c910ad6 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -178,7 +178,7 @@ impl HTMLFormElement { self.controls .borrow() .iter() - .filter(|n| HTMLFormElement::filter_for_radio_list(mode, *n, name)) + .filter(|n| HTMLFormElement::filter_for_radio_list(mode, n, name)) .nth(index as usize) .and_then(|n| Some(DomRoot::from_ref(n.upcast::()))) } @@ -187,7 +187,7 @@ impl HTMLFormElement { self.controls .borrow() .iter() - .filter(|n| HTMLFormElement::filter_for_radio_list(mode, &**n, name)) + .filter(|n| HTMLFormElement::filter_for_radio_list(mode, n, name)) .count() as u32 } } @@ -653,7 +653,7 @@ impl HTMLFormElement { // Substep 2, 3, 4 let mut candidate_encodings = - split_html_space_chars(&*input).filter_map(|c| Encoding::for_label(c.as_bytes())); + split_html_space_chars(&input).filter_map(|c| Encoding::for_label(c.as_bytes())); // Substep 5, 6 return candidate_encodings.next().unwrap_or(UTF_8); diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index cc3be0c58af..579448df4ff 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -492,7 +492,7 @@ impl HTMLMediaElement { if delay && blocker.is_none() { *blocker = Some(LoadBlocker::new(&document_from_node(self), LoadType::Media)); } else if !delay && blocker.is_some() { - LoadBlocker::terminate(&mut *blocker); + LoadBlocker::terminate(&mut blocker); } } @@ -1550,7 +1550,7 @@ impl HTMLMediaElement { PlayerEvent::Error(ref error) => { error!("Player error: {:?}", error); self.error.set(Some(&*MediaError::new( - &*window_from_node(self), + &window_from_node(self), MEDIA_ERR_DECODE, ))); self.upcast::().fire_event(atom!("error")); @@ -2817,7 +2817,7 @@ impl FetchResponseListener for HTMLMediaElementFetchListener { // Step 2 elem.error.set(Some(&*MediaError::new( - &*window_from_node(&*elem), + &window_from_node(&*elem), MEDIA_ERR_NETWORK, ))); diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index ace8c34ce3e..b6c1ef0456a 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -139,7 +139,7 @@ unsafe extern "C" fn off_thread_compilation_callback( }) }; - finish_fetching_a_classic_script(&*elem, script_kind, url, load); + finish_fetching_a_classic_script(&elem, script_kind, url, load); }), &context.canceller, ); @@ -401,7 +401,7 @@ impl FetchResponseListener for ClassicContext { (Err(err), _) | (_, Err(err)) => { // Step 6, response is an error. finish_fetching_a_classic_script( - &*self.elem.root(), + &self.elem.root(), self.kind, self.url.clone(), Err(NoTrace(err.clone())), @@ -464,7 +464,7 @@ impl FetchResponseListener for ClassicContext { self.fetch_options.clone(), ScriptType::Classic, ); - finish_fetching_a_classic_script(&*elem, self.kind, self.url.clone(), Ok(load)); + finish_fetching_a_classic_script(&elem, self.kind, self.url.clone(), Ok(load)); } } diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 93c40a5e930..29c161b6b50 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -442,17 +442,17 @@ impl HTMLTableElementLayoutHelpers for LayoutDom<'_, HTMLTableElement> { #[allow(unsafe_code)] fn get_border(self) -> Option { - unsafe { (*self.unsafe_get()).border.get() } + unsafe { (self.unsafe_get()).border.get() } } #[allow(unsafe_code)] fn get_cellpadding(self) -> Option { - unsafe { (*self.unsafe_get()).cellpadding.get() } + unsafe { (self.unsafe_get()).cellpadding.get() } } #[allow(unsafe_code)] fn get_cellspacing(self) -> Option { - unsafe { (*self.unsafe_get()).cellspacing.get() } + unsafe { (self.unsafe_get()).cellspacing.get() } } fn get_width(self) -> LengthOrPercentageOrAuto { diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/htmlvideoelement.rs index 40a4691f1be..89574d78dbe 100644 --- a/components/script/dom/htmlvideoelement.rs +++ b/components/script/dom/htmlvideoelement.rs @@ -205,7 +205,7 @@ impl HTMLVideoElement { // (which triggers no media load algorithm unless a explicit call to .load() is done) // will block the document's load event forever. let mut blocker = self.load_blocker.borrow_mut(); - LoadBlocker::terminate(&mut *blocker); + LoadBlocker::terminate(&mut blocker); *blocker = Some(LoadBlocker::new( &document_from_node(self), LoadType::Image(poster_url.clone()), diff --git a/components/script/dom/mediaelementaudiosourcenode.rs b/components/script/dom/mediaelementaudiosourcenode.rs index fed3d87b58f..f7363cdbc7f 100644 --- a/components/script/dom/mediaelementaudiosourcenode.rs +++ b/components/script/dom/mediaelementaudiosourcenode.rs @@ -34,7 +34,7 @@ impl MediaElementAudioSourceNode { ) -> Fallible { let node = AudioNode::new_inherited( AudioNodeInit::MediaElementSourceNode, - &*context.base(), + &context.base(), Default::default(), 0, 1, @@ -78,7 +78,7 @@ impl MediaElementAudioSourceNode { context: &AudioContext, options: &MediaElementAudioSourceOptions, ) -> Fallible> { - MediaElementAudioSourceNode::new_with_proto(window, proto, context, &*options.mediaElement) + MediaElementAudioSourceNode::new_with_proto(window, proto, context, &options.mediaElement) } } diff --git a/components/script/dom/messagechannel.rs b/components/script/dom/messagechannel.rs index 315110b8d27..99eae8325d0 100644 --- a/components/script/dom/messagechannel.rs +++ b/components/script/dom/messagechannel.rs @@ -36,15 +36,15 @@ impl MessageChannel { // Step 2 let port2 = MessagePort::new(incumbent); - incumbent.track_message_port(&*port1, None); - incumbent.track_message_port(&*port2, None); + incumbent.track_message_port(&port1, None); + incumbent.track_message_port(&port2, None); // Step 3 incumbent.entangle_ports(*port1.message_port_id(), *port2.message_port_id()); // Steps 4-6 reflect_dom_object_with_proto( - Box::new(MessageChannel::new_inherited(&*port1, &*port2)), + Box::new(MessageChannel::new_inherited(&port1, &port2)), incumbent, proto, ) diff --git a/components/script/dom/messageport.rs b/components/script/dom/messageport.rs index e37a087b6a5..07a3c8749b7 100644 --- a/components/script/dom/messageport.rs +++ b/components/script/dom/messageport.rs @@ -183,8 +183,8 @@ impl Transferable for MessagePort { *port_impls = Some(ports); } - let PipelineNamespaceId(name_space) = (*id).namespace_id; - let MessagePortIndex(index) = (*id).index; + let PipelineNamespaceId(name_space) = (id).namespace_id; + let MessagePortIndex(index) = (id).index; let index = index.get(); let mut big: [u8; 8] = [0; 8]; diff --git a/components/script/dom/mutationobserver.rs b/components/script/dom/mutationobserver.rs index 99681c5941a..650d6caefb1 100644 --- a/components/script/dom/mutationobserver.rs +++ b/components/script/dom/mutationobserver.rs @@ -94,7 +94,7 @@ impl MutationObserver { ) -> Fallible> { global.set_exists_mut_observer(); let observer = MutationObserver::new_with_proto(global, proto, callback); - ScriptThread::add_mutation_observer(&*observer); + ScriptThread::add_mutation_observer(&observer); Ok(observer) } @@ -125,7 +125,7 @@ impl MutationObserver { if !queue.is_empty() { let _ = mo .callback - .Call_(&**mo, queue, &**mo, ExceptionHandling::Report); + .Call_(&**mo, queue, mo, ExceptionHandling::Report); } } // TODO: Step 6 (slot signals) diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 089e73cf889..65a47a53594 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -282,7 +282,7 @@ impl Node { node.set_flag(NodeFlags::IS_CONNECTED, parent_is_connected); // Out-of-document elements never have the descendants flag set. debug_assert!(!node.get_flag(NodeFlags::HAS_DIRTY_DESCENDANTS)); - vtable_for(&*node).bind_to_tree(&BindContext { + vtable_for(&node).bind_to_tree(&BindContext { tree_connected: parent_is_connected, tree_in_doc: parent_in_doc, }); @@ -313,11 +313,11 @@ impl Node { // This needs to be in its own loop, because unbind_from_tree may // rely on the state of IS_IN_DOC of the context node's descendants, // e.g. when removing a
. - vtable_for(&*node).unbind_from_tree(context); + vtable_for(&node).unbind_from_tree(context); // https://dom.spec.whatwg.org/#concept-node-remove step 14 if let Some(element) = node.as_custom_element() { ScriptThread::enqueue_callback_reaction( - &*element, + &element, CallbackReaction::Disconnected, None, ); @@ -551,7 +551,7 @@ impl Node { s.push_str(" "); } - s.push_str(&*self.debug_str()); + s.push_str(&self.debug_str()); debug!("{:?}", s); // FIXME: this should have a pure version? @@ -1443,14 +1443,14 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> { #[inline] #[allow(unsafe_code)] unsafe fn get_flag(self, flag: NodeFlags) -> bool { - (*self.unsafe_get()).flags.get().contains(flag) + (self.unsafe_get()).flags.get().contains(flag) } #[inline] #[allow(unsafe_code)] unsafe fn set_flag(self, flag: NodeFlags, value: bool) { let this = self.unsafe_get(); - let mut flags = (*this).flags.get(); + let mut flags = (this).flags.get(); if value { flags.insert(flag); @@ -1458,7 +1458,7 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> { flags.remove(flag); } - (*this).flags.set(flags); + (this).flags.set(flags); } #[inline] @@ -1846,7 +1846,7 @@ impl Node { { // Step 3.2. ScriptThread::enqueue_callback_reaction( - &*descendant, + &descendant, CallbackReaction::Adopted(old_doc.clone(), DomRoot::from_ref(document)), None, ); @@ -2072,7 +2072,7 @@ impl Node { // Step 7. for kid in new_nodes { // Step 7.1. - parent.add_child(*kid, child); + parent.add_child(kid, child); // Step 7.7. for descendant in kid .traverse_preorder(ShadowIncluding::Yes) @@ -2083,7 +2083,7 @@ impl Node { if descendant.get_custom_element_definition().is_some() { // Step 7.7.2.1. ScriptThread::enqueue_callback_reaction( - &*descendant, + &descendant, CallbackReaction::Connected, None, ); @@ -2289,7 +2289,7 @@ impl Node { IsHTMLDocument::NonHTMLDocument }; let window = document.window(); - let loader = DocumentLoader::new(&*document.loader()); + let loader = DocumentLoader::new(&document.loader()); let document = Document::new( window, HasBrowsingContext::No, @@ -3270,7 +3270,7 @@ impl<'a> ChildrenMutation<'a> { } else { ChildrenMutation::Replace { prev, - removed: *removed, + removed, added, next, } diff --git a/components/script/dom/paintworkletglobalscope.rs b/components/script/dom/paintworkletglobalscope.rs index 154b3c73d02..c6a182d956e 100644 --- a/components/script/dom/paintworkletglobalscope.rs +++ b/components/script/dom/paintworkletglobalscope.rs @@ -150,13 +150,8 @@ impl PaintWorkletGlobalScope { self.upcast(), properties.iter().cloned(), ); - let result = self.draw_a_paint_image( - &name, - size, - device_pixel_ratio, - &*map, - &*arguments, - ); + let result = + self.draw_a_paint_image(&name, size, device_pixel_ratio, &map, &arguments); if (result.image_key.is_some()) && (result.missing_image_urls.is_empty()) { *self.cached_name.borrow_mut() = name; self.cached_size.set(size); @@ -180,13 +175,8 @@ impl PaintWorkletGlobalScope { self.upcast(), properties.iter().cloned(), ); - let result = self.draw_a_paint_image( - &name, - size, - device_pixel_ratio, - &*map, - &*arguments, - ); + let result = + self.draw_a_paint_image(&name, size, device_pixel_ratio, &map, &arguments); if (result.image_key.is_some()) && (result.missing_image_urls.is_empty()) { *self.cached_name.borrow_mut() = name; *self.cached_properties.borrow_mut() = properties; @@ -322,7 +312,7 @@ impl PaintWorkletGlobalScope { .map(|argument| ObjectValue(argument.reflector().get_jsobject().get())) .collect(); let arguments_value_array = - unsafe { HandleValueArray::from_rooted_slice(&*arguments_value_vec) }; + unsafe { HandleValueArray::from_rooted_slice(&arguments_value_vec) }; rooted!(in(*cx) let argument_object = unsafe { NewArrayObject(*cx, &arguments_value_array) }); let args_slice = [ @@ -576,7 +566,7 @@ impl PaintWorkletGlobalScopeMethods for PaintWorkletGlobalScope { paint_function.handle(), alpha, input_arguments.len(), - &*context, + &context, ); // Step 20. diff --git a/components/script/dom/performanceobserver.rs b/components/script/dom/performanceobserver.rs index f1c720380cc..ebf6e95d615 100644 --- a/components/script/dom/performanceobserver.rs +++ b/components/script/dom/performanceobserver.rs @@ -192,7 +192,7 @@ impl PerformanceObserverMethods for PerformanceObserver { // Step 6.3 if entry_types.is_empty() { Console::internal_warn( - &*self.global(), + &self.global(), DOMString::from("No valid entry type provided to observe()."), ); return Ok(()); @@ -209,7 +209,7 @@ impl PerformanceObserverMethods for PerformanceObserver { // Step 7.2 if !VALID_ENTRY_TYPES.contains(&entry_type.as_ref()) { Console::internal_warn( - &*self.global(), + &self.global(), DOMString::from("No valid entry type provided to observe()."), ); return Ok(()); diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index feeef281041..893252b1321 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -246,7 +246,7 @@ impl Promise { #[allow(unsafe_code)] pub fn append_native_handler(&self, handler: &PromiseNativeHandler, _comp: InRealm) { - let _ais = AutoEntryScript::new(&*handler.global()); + let _ais = AutoEntryScript::new(&handler.global()); let cx = GlobalScope::get_cx(); rooted!(in(*cx) let resolve_func = create_native_handler_function(*cx, diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index 09f0d8454d0..7033ce82834 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -1010,7 +1010,7 @@ impl RangeMethods for Range { // Step 3. s.push_str( - &*char_data + &char_data .SubstringData( self.start_offset(), char_data.Length() - self.start_offset(), @@ -1027,14 +1027,14 @@ impl RangeMethods for Range { while let Some(child) = iter.next() { if self.contains(child.upcast()) { - s.push_str(&*child.upcast::().Data()); + s.push_str(&child.upcast::().Data()); } } // Step 5. if let Some(text_node) = end_node.downcast::() { let char_data = text_node.upcast::(); - s.push_str(&*char_data.SubstringData(0, self.end_offset()).unwrap()); + s.push_str(&char_data.SubstringData(0, self.end_offset()).unwrap()); } // Step 6. diff --git a/components/script/dom/readablestream.rs b/components/script/dom/readablestream.rs index ca2bdca8c80..19145e40a5d 100644 --- a/components/script/dom/readablestream.rs +++ b/components/script/dom/readablestream.rs @@ -250,7 +250,7 @@ impl ReadableStream { let global = self.global(); let _ar = enter_realm(&*global); - let _aes = AutoEntryScript::new(&*global); + let _aes = AutoEntryScript::new(&global); let cx = GlobalScope::get_cx(); diff --git a/components/script/dom/rtcdatachannel.rs b/components/script/dom/rtcdatachannel.rs index c6b9943364f..87429be677c 100644 --- a/components/script/dom/rtcdatachannel.rs +++ b/components/script/dom/rtcdatachannel.rs @@ -107,7 +107,7 @@ impl RTCDataChannel { global, ); - peer_connection.register_data_channel(rtc_data_channel.servo_media_id, &*rtc_data_channel); + peer_connection.register_data_channel(rtc_data_channel.servo_media_id, &rtc_data_channel); rtc_data_channel } diff --git a/components/script/dom/selection.rs b/components/script/dom/selection.rs index 8d16372e46c..7d62cb04db2 100644 --- a/components/script/dom/selection.rs +++ b/components/script/dom/selection.rs @@ -202,7 +202,7 @@ impl SelectionMethods for Selection { // https://w3c.github.io/selection-api/#dom-selection-addrange fn AddRange(&self, range: &Range) { // Step 1 - if !self.is_same_root(&*range.start_container()) { + if !self.is_same_root(&range.start_container()) { return; } @@ -319,9 +319,9 @@ impl SelectionMethods for Selection { } // Step 4 - if !self.is_same_root(&*range.start_container()) { + if !self.is_same_root(&range.start_container()) { // Step 5, and its following 8 and 9 - self.set_range(&*Range::new(&self.document, node, offset, node, offset)); + self.set_range(&Range::new(&self.document, node, offset, node, offset)); self.direction.set(Direction::Forwards); } else { let old_anchor_node = &*self.GetAnchorNode().unwrap(); // has range, therefore has anchor node @@ -335,7 +335,7 @@ impl SelectionMethods for Selection { }; if is_old_anchor_before_or_equal { // Step 6, and its following 8 and 9 - self.set_range(&*Range::new( + self.set_range(&Range::new( &self.document, old_anchor_node, old_anchor_offset, @@ -345,7 +345,7 @@ impl SelectionMethods for Selection { self.direction.set(Direction::Forwards); } else { // Step 7, and its following 8 and 9 - self.set_range(&*Range::new( + self.set_range(&Range::new( &self.document, node, offset, @@ -394,7 +394,7 @@ impl SelectionMethods for Selection { } }; if is_focus_before_anchor { - self.set_range(&*Range::new( + self.set_range(&Range::new( &self.document, focus_node, focus_offset, @@ -403,7 +403,7 @@ impl SelectionMethods for Selection { )); self.direction.set(Direction::Backwards); } else { - self.set_range(&*Range::new( + self.set_range(&Range::new( &self.document, anchor_node, anchor_offset, @@ -428,7 +428,7 @@ impl SelectionMethods for Selection { // Spec wording just says node length here, but WPT specifically // wants number of children (the main difference is that it's 0 // for cdata). - self.set_range(&*Range::new( + self.set_range(&Range::new( &self.document, node, 0, diff --git a/components/script/dom/serviceworkercontainer.rs b/components/script/dom/serviceworkercontainer.rs index bafbfb34b44..dc75fb01e80 100644 --- a/components/script/dom/serviceworkercontainer.rs +++ b/components/script/dom/serviceworkercontainer.rs @@ -48,7 +48,7 @@ impl ServiceWorkerContainer { #[allow(crown::unrooted_must_root)] pub fn new(global: &GlobalScope) -> DomRoot { let client = Client::new(global.as_window()); - let container = ServiceWorkerContainer::new_inherited(&*client); + let container = ServiceWorkerContainer::new_inherited(&client); reflect_dom_object(Box::new(container), global) } } @@ -165,7 +165,7 @@ impl ServiceWorkerContainerMethods for ServiceWorkerContainer { ); let scope_things = - ServiceWorkerRegistration::create_scope_things(&*global, script_url.clone()); + ServiceWorkerRegistration::create_scope_things(&global, script_url.clone()); // B: Step 8 - 13 let job = Job::create_job( diff --git a/components/script/dom/servoparser/async_html.rs b/components/script/dom/servoparser/async_html.rs index af52fdf97cb..5beffe225f3 100644 --- a/components/script/dom/servoparser/async_html.rs +++ b/components/script/dom/servoparser/async_html.rs @@ -425,7 +425,7 @@ impl Tokenizer { let element = create_element_for_token( name, attrs, - &*self.document, + &self.document, ElementCreator::ParserCreated(current_line), ParsingAlgorithm::Normal, ); @@ -480,7 +480,7 @@ impl Tokenizer { }, ParseOperation::RemoveFromParent { target } => { if let Some(ref parent) = self.get_node(&target).GetParentNode() { - parent.RemoveChild(&**self.get_node(&target)).unwrap(); + parent.RemoveChild(self.get_node(&target)).unwrap(); } }, ParseOperation::MarkScriptAlreadyStarted { node } => { diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs index ffcb9b513cb..8bef76d2ed9 100644 --- a/components/script/dom/servoparser/html.rs +++ b/components/script/dom/servoparser/html.rs @@ -173,7 +173,7 @@ impl SerializationIterator { let mut ret = SerializationIterator { stack: vec![] }; if skip_first || node.is::() || node.is::() { for c in rev_children_iter(node) { - ret.push_node(&*c); + ret.push_node(&c); } } else { ret.push_node(node); diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs index 8ce5589b7dc..acfb64aa069 100644 --- a/components/script/dom/servoparser/mod.rs +++ b/components/script/dom/servoparser/mod.rs @@ -483,7 +483,7 @@ impl ServoParser { prefetch_input.push_back(chunk.clone()); self.prefetch_tokenizer .borrow_mut() - .feed(&mut *prefetch_input); + .feed(&mut prefetch_input); } // Push the chunk into the network input stream, // which is tokenized lazily. @@ -1130,7 +1130,7 @@ impl TreeSink for Sink { let element = create_element_for_token( name, attrs, - &*self.document, + &self.document, ElementCreator::ParserCreated(self.current_line), self.parsing_algorithm, ); diff --git a/components/script/dom/servoparser/prefetch.rs b/components/script/dom/servoparser/prefetch.rs index 7ccca449d15..d11da362149 100644 --- a/components/script/dom/servoparser/prefetch.rs +++ b/components/script/dom/servoparser/prefetch.rs @@ -206,7 +206,7 @@ impl PrefetchSink { fn get_referrer_policy(&self, tag: &Tag, name: LocalName) -> Option { self.get_attr(tag, name) - .and_then(|attr| determine_policy_for_token(&*attr.value)) + .and_then(|attr| determine_policy_for_token(&attr.value)) .or(self.referrer_policy) } diff --git a/components/script/dom/testworklet.rs b/components/script/dom/testworklet.rs index a8ecb073131..e5e502ed7c7 100644 --- a/components/script/dom/testworklet.rs +++ b/components/script/dom/testworklet.rs @@ -39,7 +39,7 @@ impl TestWorklet { fn new(window: &Window, proto: Option) -> DomRoot { let worklet = Worklet::new(window, WorkletGlobalScopeType::Test); reflect_dom_object_with_proto( - Box::new(TestWorklet::new_inherited(&*worklet)), + Box::new(TestWorklet::new_inherited(&worklet)), window, proto, ) diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index e7d7662a1db..e076a3640c4 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1565,7 +1565,7 @@ impl WebGLRenderingContext { rb.storage(self.api_type, samples, internal_format, width, height) ); if let Some(fb) = self.bound_draw_framebuffer.get() { - fb.invalidate_renderbuffer(&*rb); + fb.invalidate_renderbuffer(&rb); } // FIXME: https://github.com/servo/servo/issues/13710 @@ -1639,7 +1639,7 @@ impl WebGLRenderingContext { }); if let Some(fb) = self.bound_draw_framebuffer.get() { - fb.invalidate_texture(&*texture); + fb.invalidate_texture(&texture); } } diff --git a/components/script/dom/windowproxy.rs b/components/script/dom/windowproxy.rs index 096b391ae00..6b9d44ba1c3 100644 --- a/components/script/dom/windowproxy.rs +++ b/components/script/dom/windowproxy.rs @@ -245,7 +245,7 @@ impl WindowProxy { )); // Create a new dissimilar-origin window. - let window = DissimilarOriginWindow::new(global_to_clone_from, &*window_proxy); + let window = DissimilarOriginWindow::new(global_to_clone_from, &window_proxy); let window_jsobject = window.reflector().get_jsobject(); assert!(!window_jsobject.get().is_null()); assert_ne!( @@ -442,7 +442,7 @@ impl WindowProxy { let creator = CreatorBrowsingContextInfo::from(parent_browsing_context, None); WindowProxy::new_dissimilar_origin( - &*global_to_clone_from, + &global_to_clone_from, opener_id, opener_top_id, None, @@ -690,7 +690,7 @@ impl WindowProxy { return debug!("Attempt to unset the currently active window on a windowproxy that does not have one."); } let globalscope = self.global(); - let window = DissimilarOriginWindow::new(&*globalscope, self); + let window = DissimilarOriginWindow::new(&globalscope, self); self.set_window(&*window.upcast(), &XORIGIN_PROXY_HANDLER); self.currently_active.set(None); } @@ -1091,7 +1091,7 @@ unsafe fn throw_security_error(cx: *mut JSContext, realm: InRealm) -> bool { if !JS_IsExceptionPending(cx) { let safe_context = SafeJSContext::from_ptr(cx); let global = GlobalScope::from_context(cx, realm); - throw_dom_exception(safe_context, &*global, Error::Security); + throw_dom_exception(safe_context, &global, Error::Security); } false } diff --git a/components/script/dom/worklet.rs b/components/script/dom/worklet.rs index 2404964db41..78504390032 100644 --- a/components/script/dom/worklet.rs +++ b/components/script/dom/worklet.rs @@ -668,7 +668,7 @@ impl WorkletThread { // to the main script thread. // https://github.com/w3c/css-houdini-drafts/issues/407 let ok = script - .map(|script| global_scope.evaluate_js(&*script)) + .map(|script| global_scope.evaluate_js(&script)) .unwrap_or(false); if !ok { diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 3f5adafcd21..4465ec1596e 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -1517,7 +1517,7 @@ impl XMLHttpRequest { let wr = self.global(); let win = wr.as_window(); let doc = win.Document(); - let docloader = DocumentLoader::new(&*doc.loader()); + let docloader = DocumentLoader::new(&doc.loader()); let base = wr.get_url(); let parsed_url = match base.join(&self.ResponseURL().0) { Ok(parsed) => Some(parsed), diff --git a/components/script/dom/xrinputsourceschangeevent.rs b/components/script/dom/xrinputsourceschangeevent.rs index ade0a977c51..30b16ba95d2 100644 --- a/components/script/dom/xrinputsourceschangeevent.rs +++ b/components/script/dom/xrinputsourceschangeevent.rs @@ -108,8 +108,8 @@ impl XRInputSourcesChangeEvent { init.parent.bubbles, init.parent.cancelable, &init.session, - &*init.added, - &*init.removed, + &init.added, + &init.removed, ) } } diff --git a/components/script/dom/xrrenderstate.rs b/components/script/dom/xrrenderstate.rs index d070e144374..44550ea3ca0 100644 --- a/components/script/dom/xrrenderstate.rs +++ b/components/script/dom/xrrenderstate.rs @@ -108,7 +108,7 @@ impl XRRenderState { F: FnOnce(&[Dom]) -> R, { let layers = self.layers.borrow(); - f(&*layers) + f(&layers) } pub fn has_sub_images(&self, sub_images: &[SubImages]) -> bool { if let Some(base_layer) = self.base_layer.get() { diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs index 02ead4104db..effad1f8dea 100644 --- a/components/script/dom/xrsession.rs +++ b/components/script/dom/xrsession.rs @@ -429,10 +429,10 @@ impl XRSession { frame.set_animation_frame(true); // Step 10 - self.apply_frame_updates(&*frame); + self.apply_frame_updates(&frame); // TODO: how does this fit with the webxr and xr layers specs? - self.layers_begin_frame(&*frame); + self.layers_begin_frame(&frame); // Step 11-12 self.outside_raf.set(false); @@ -450,7 +450,7 @@ impl XRSession { *self.current_raf_callback_list.borrow_mut() = vec![]; // TODO: how does this fit with the webxr and xr layers specs? - self.layers_end_frame(&*frame); + self.layers_end_frame(&frame); // Step 13 frame.set_active(false); diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 7a4c5966504..ad7657830bc 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -354,7 +354,7 @@ impl ModuleTree { let realm = enter_realm(&*owner.global()); let comp = InRealm::Entered(&realm); - let _ais = AutoIncumbentScript::new(&*owner.global()); + let _ais = AutoIncumbentScript::new(&owner.global()); let mut promise = self.promise.borrow_mut(); match promise.as_ref() { @@ -390,7 +390,7 @@ impl ModuleTree { let realm = enter_realm(&*owner.global()); let comp = InRealm::Entered(&realm); - let _ais = AutoIncumbentScript::new(&*owner.global()); + let _ais = AutoIncumbentScript::new(&owner.global()); let mut promise = self.promise.borrow_mut(); match promise.as_ref() { @@ -930,11 +930,11 @@ impl ModuleOwner { .has_attribute(&local_name!("async")); if !asynch && (*script.root()).get_parser_inserted() { - document.deferred_script_loaded(&*script.root(), load); + document.deferred_script_loaded(&script.root(), load); } else if !asynch && !(*script.root()).get_non_blocking() { - document.asap_in_order_script_loaded(&*script.root(), load); + document.asap_in_order_script_loaded(&script.root(), load); } else { - document.asap_script_loaded(&*script.root(), load); + document.asap_script_loaded(&script.root(), load); }; }, } diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 2f5600cd932..2428bb6a406 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -2205,10 +2205,10 @@ impl ScriptThread { None => warn!("Message sent to closed pipeline {}.", id), }, DevtoolScriptControlMsg::SetTimelineMarkers(id, marker_types, reply) => { - devtools::handle_set_timeline_markers(&*documents, id, marker_types, reply) + devtools::handle_set_timeline_markers(&documents, id, marker_types, reply) }, DevtoolScriptControlMsg::DropTimelineMarkers(id, marker_types) => { - devtools::handle_drop_timeline_markers(&*documents, id, marker_types) + devtools::handle_drop_timeline_markers(&documents, id, marker_types) }, DevtoolScriptControlMsg::RequestAnimationFrame(id, name) => { devtools::handle_request_animation_frame(&documents, id, name)