From 16fa9cabc92e8c69c1161a20b58d0e32c7ab40c2 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Fri, 30 Oct 2015 18:41:22 -0400 Subject: Fix some rust-clippy violations --- components/script/dom/htmlscriptelement.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/htmlscriptelement.rs') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 97fefdf30e2..118c0648e77 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -562,8 +562,8 @@ impl VirtualMethods for HTMLScriptElement { fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) { self.super_type().unwrap().attribute_mutated(attr, mutation); - match attr.local_name() { - &atom!("src") => { + match *attr.local_name() { + atom!("src") => { if let AttributeMutation::Set(_) = mutation { if !self.parser_inserted.get() && self.upcast::().is_in_doc() { self.prepare(); -- cgit v1.2.3 From d8ef3809a6c73922a5affc475f623a0f1152be28 Mon Sep 17 00:00:00 2001 From: nxnfufunezn Date: Sat, 31 Oct 2015 17:41:00 +0530 Subject: Removed JS::root Fixes #8251 --- components/script/dom/htmlscriptelement.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/htmlscriptelement.rs') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 118c0648e77..4f1b0ca135a 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -364,7 +364,7 @@ impl HTMLScriptElement { // Step 1. let doc = document_from_node(self); - if self.parser_inserted.get() && doc.r() != self.parser_document.root().r() { + if self.parser_inserted.get() && &*doc != &*self.parser_document { return; } -- cgit v1.2.3 From df7fb8fa326e2b061e2da8c833cc558273db5f37 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Mon, 2 Nov 2015 14:21:11 -0800 Subject: Remove JSTraceable implementation from RefCell. The implementation wasn't really right, and we would rather just use DOMRefCell anyway. --- components/script/dom/htmlscriptelement.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/htmlscriptelement.rs') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 4f1b0ca135a..3b0f17a881f 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -37,7 +37,7 @@ use network_listener::{NetworkListener, PreInvoke}; use script_task::ScriptTaskEventCategory::ScriptEvent; use script_task::{CommonScriptMsg, Runnable, ScriptChan}; use std::ascii::AsciiExt; -use std::cell::{Cell, RefCell}; +use std::cell::Cell; use std::mem; use std::sync::{Arc, Mutex}; use url::{Url, UrlParser}; @@ -65,7 +65,7 @@ pub struct HTMLScriptElement { parser_document: JS, /// The source this script was loaded from - load: RefCell>, + load: DOMRefCell>, #[ignore_heap_size_of = "Defined in rust-encoding"] /// https://html.spec.whatwg.org/multipage/#concept-script-encoding @@ -83,7 +83,7 @@ impl HTMLScriptElement { non_blocking: Cell::new(creator != ElementCreator::ParserCreated), ready_to_be_parser_executed: Cell::new(false), parser_document: JS::from_ref(document), - load: RefCell::new(None), + load: DOMRefCell::new(None), block_character_encoding: DOMRefCell::new(UTF_8 as EncodingRef), } } -- cgit v1.2.3