aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/Cargo.toml1
-rw-r--r--components/script/lib.rs1
-rw-r--r--components/script/stylesheet_loader.rs5
3 files changed, 4 insertions, 3 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index c736ba19c8e..1013a3adfe2 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -40,6 +40,7 @@ devtools_traits = {path = "../devtools_traits"}
dom_struct = {path = "../dom_struct"}
domobject_derive = {path = "../domobject_derive"}
encoding = "0.2"
+encoding_rs = "0.7"
euclid = "0.15"
fnv = "1.0"
gleam = "0.4"
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 88fe2b4f593..74276422207 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -35,6 +35,7 @@ extern crate dom_struct;
#[macro_use]
extern crate domobject_derive;
extern crate encoding;
+extern crate encoding_rs;
extern crate euclid;
extern crate fnv;
extern crate gleam;
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs
index 094eff5b022..09b22913424 100644
--- a/components/script/stylesheet_loader.rs
+++ b/components/script/stylesheet_loader.rs
@@ -13,8 +13,7 @@ use dom::eventtarget::EventTarget;
use dom::htmlelement::HTMLElement;
use dom::htmllinkelement::{RequestGenerationId, HTMLLinkElement};
use dom::node::{document_from_node, window_from_node};
-use encoding::EncodingRef;
-use encoding::all::UTF_8;
+use encoding_rs::UTF_8;
use hyper::header::ContentType;
use hyper::mime::{Mime, TopLevel, SubLevel};
use hyper_serde::Serde;
@@ -127,7 +126,7 @@ impl FetchResponseListener for StylesheetContext {
let data = if is_css { mem::replace(&mut self.data, vec![]) } else { vec![] };
// TODO: Get the actual value. http://dev.w3.org/csswg/css-syntax/#environment-encoding
- let environment_encoding = UTF_8 as EncodingRef;
+ let environment_encoding = UTF_8;
let protocol_encoding_label = metadata.charset.as_ref().map(|s| &**s);
let final_url = metadata.final_url;