From 3dec6edd10ec800de50a04c105a75fb98e0411ca Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Tue, 24 Nov 2015 13:44:59 -0600
Subject: Update string_cache to 0.2.

Updated string_cache, html5ever, xml5ever and selectors in Cargo.toml files and Cargo.lock.
Removed references to string_cache_plugin.
Import atom! and ns! from string_cache.
Replaced ns!("") by ns!().
Replaced ns!(XML) and co by ns!(xml) and co.
Replaced atom!(foo) by atom!("foo").
Replaced Atom::from_slice by Atom::from.
Replaced atom.as_slice() by &*atom.
---
 components/script/dom/htmlscriptelement.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'components/script/dom/htmlscriptelement.rs')

diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 1a37926772e..62c850c9942 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -216,8 +216,8 @@ impl HTMLScriptElement {
         }
 
         // Step 12.
-        let for_attribute = element.get_attribute(&ns!(""), &atom!("for"));
-        let event_attribute = element.get_attribute(&ns!(""), &atom!("event"));
+        let for_attribute = element.get_attribute(&ns!(), &atom!("for"));
+        let event_attribute = element.get_attribute(&ns!(), &atom!("event"));
         match (for_attribute.r(), event_attribute.r()) {
             (Some(for_attribute), Some(event_attribute)) => {
                 let for_value = for_attribute.value().to_ascii_lowercase();
@@ -236,7 +236,7 @@ impl HTMLScriptElement {
         }
 
         // Step 13.
-        if let Some(ref charset) = element.get_attribute(&ns!(""), &atom!("charset")) {
+        if let Some(ref charset) = element.get_attribute(&ns!(), &atom!("charset")) {
             if let Some(encodingRef) = encoding_from_whatwg_label(&charset.Value()) {
                 *self.block_character_encoding.borrow_mut() = encodingRef;
             }
@@ -248,7 +248,7 @@ impl HTMLScriptElement {
         let base_url = window.get_url();
         let deferred = element.has_attribute(&atom!("defer"));
 
-        let is_external = match element.get_attribute(&ns!(""), &atom!("src")) {
+        let is_external = match element.get_attribute(&ns!(), &atom!("src")) {
             // Step 14.
             Some(ref src) => {
                 // Step 14.1
@@ -500,7 +500,7 @@ impl HTMLScriptElement {
 
     pub fn is_javascript(&self) -> bool {
         let element = self.upcast::<Element>();
-        let type_attr = element.get_attribute(&ns!(""), &atom!("type"));
+        let type_attr = element.get_attribute(&ns!(), &atom!("type"));
         let is_js = match type_attr.as_ref().map(|s| s.value()) {
             Some(ref s) if s.is_empty() => {
                 // type attr exists, but empty means js
@@ -513,7 +513,7 @@ impl HTMLScriptElement {
             },
             None => {
                 debug!("no script type");
-                let language_attr = element.get_attribute(&ns!(""), &atom!("language"));
+                let language_attr = element.get_attribute(&ns!(), &atom!("language"));
                 let is_js = match language_attr.as_ref().map(|s| s.value()) {
                     Some(ref s) if s.is_empty() => {
                         debug!("script language empty, inferring js");
-- 
cgit v1.2.3