4 files changed, 7 insertions, 7 deletions
diff --git a/src/components/script/html/cssparse.rs b/src/components/script/html/cssparse.rs
index 76d294e978e..0ba1aadbe03 100644
--- a/src/components/script/html/cssparse.rs
+++ b/src/components/script/html/cssparse.rs
@@ -8,7 +8,7 @@ use std::cell::Cell;
 use std::comm;
 use std::comm::Port;
 use std::task;
-use encoding::EncodingObj;
+use encoding::EncodingRef;
 use encoding::all::UTF_8;
 use style::Stylesheet;
 use servo_net::resource_task::{Load, LoadResponse, ProgressMsg, Payload, Done, ResourceTask};
@@ -26,7 +26,7 @@ pub fn spawn_css_parser(provenance: StylesheetProvenance,
     let (result_port, result_chan) = comm::stream();
 
     // TODO: Get the actual value. http://dev.w3.org/csswg/css-syntax/#environment-encoding
-    let environment_encoding = UTF_8 as EncodingObj;
+    let environment_encoding = UTF_8 as EncodingRef;
 
     let provenance_cell = Cell::new(provenance);
     do task::spawn {
diff --git a/src/components/style/stylesheets.rs b/src/components/style/stylesheets.rs
index 034f77a2f71..673974961c5 100644
--- a/src/components/style/stylesheets.rs
+++ b/src/components/style/stylesheets.rs
@@ -6,7 +6,7 @@ use std::iter::Iterator;
 use std::ascii::StrAsciiExt;
 use extra::url::Url;
 
-use encoding::EncodingObj;
+use encoding::EncodingRef;
 
 use cssparser::{decode_stylesheet_bytes, tokenize, parse_stylesheet_rules, ToCss};
 use cssparser::ast::*;
@@ -23,7 +23,7 @@ pub struct Stylesheet {
     /// cascading order)
     rules: ~[CSSRule],
     namespaces: NamespaceMap,
-    encoding: EncodingObj,
+    encoding: EncodingRef,
     base_url: Url,
 }
 
@@ -43,7 +43,7 @@ pub struct StyleRule {
 impl Stylesheet {
     pub fn from_bytes_iter<I: Iterator<~[u8]>>(
             mut input: I, base_url: Url, protocol_encoding_label: Option<&str>,
-            environment_encoding: Option<EncodingObj>) -> Stylesheet {
+            environment_encoding: Option<EncodingRef>) -> Stylesheet {
         let mut bytes = ~[];
         // TODO: incremental decoding and tokinization/parsing
         for chunk in input {
@@ -54,13 +54,13 @@ impl Stylesheet {
 
     pub fn from_bytes(
             bytes: &[u8], base_url: Url, protocol_encoding_label: Option<&str>,
-            environment_encoding: Option<EncodingObj>) -> Stylesheet {
+            environment_encoding: Option<EncodingRef>) -> Stylesheet {
         let (string, used_encoding) = decode_stylesheet_bytes(
             bytes, protocol_encoding_label, environment_encoding);
         Stylesheet::from_str(string, base_url, used_encoding)
     }
 
-    pub fn from_str(css: &str, base_url: Url, encoding: EncodingObj) -> Stylesheet {
+    pub fn from_str(css: &str, base_url: Url, encoding: EncodingRef) -> Stylesheet {
         static STATE_CHARSET: uint = 1;
         static STATE_IMPORTS: uint = 2;
         static STATE_NAMESPACES: uint = 3;
diff --git a/src/support/css/rust-cssparser b/src/support/css/rust-cssparser
-Subproject 4eb52d5cb22e39c9edff848420c910b0b7ecafa
+Subproject 5178431109f4a51f38c257e36640702320c5495
diff --git a/src/support/encoding/rust-encoding b/src/support/encoding/rust-encoding
-Subproject 47bef0fe76e094e7886f3eaabb652d0f43af191
+Subproject 1a6c011b697fe6d51a1d92a2504d6fac1b67d2d