Use rust-encoding’s new EncodeObj type.

See servo/rust-encoding@b9e0332

Author: SimonSapin

from_bytes.rs

@@ -6,9 +6,7 @@ use std::str;
 
 use encoding::label::encoding_from_whatwg_label;
 use encoding::all::UTF_8;
-use encoding::Encoding;
-use encoding::DecodeReplace;
-use encoding::decode;
+use encoding::{EncodingObj, DecodeReplace, decode};
 
 use tokenizer::{tokenize, Tokenizer};
 use parser::{parse_stylesheet_rules, StylesheetParser};
@@ -33,8 +31,8 @@ use parser::{parse_stylesheet_rules, StylesheetParser};
 ///     A 2-tuple of a decoded Unicode string
 ///     and the `Encoding` object that was used.
 pub fn decode_stylesheet_bytes(css: &[u8], protocol_encoding_label: Option<&str>,
-                               environment_encoding: Option<&'static Encoding>)
-                            -> (~str, &'static Encoding) {
+                               environment_encoding: Option<EncodingObj>)
+                            -> (~str, EncodingObj) {
     // http://dev.w3.org/csswg/css-syntax/#the-input-byte-stream
     match protocol_encoding_label {
         None => (),
@@ -56,7 +54,7 @@ pub fn decode_stylesheet_bytes(css: &[u8], protocol_encoding_label: Option<&str>
                     None => (),
                     Some(fallback) => match fallback.name() {
                         "utf-16be" | "utf-16le"
-                        => return decode_replace(css, UTF_8 as &'static Encoding),
+                        => return decode_replace(css, UTF_8 as EncodingObj),
                         _ => return decode_replace(css, fallback),
                     }
                 }
@@ -67,12 +65,12 @@ pub fn decode_stylesheet_bytes(css: &[u8], protocol_encoding_label: Option<&str>
         None => (),
         Some(fallback) => return decode_replace(css, fallback)
     }
-    return decode_replace(css, UTF_8 as &'static Encoding)
+    return decode_replace(css, UTF_8 as EncodingObj)
 }
 
 
 #[inline]
-fn decode_replace(input: &[u8], fallback_encoding: &'static Encoding)-> (~str, &'static Encoding) {
+fn decode_replace(input: &[u8], fallback_encoding: EncodingObj)-> (~str, EncodingObj) {
     let (result, used_encoding) = decode(input, DecodeReplace, fallback_encoding);
     (result.unwrap(), used_encoding)
 }
@@ -94,8 +92,8 @@ fn decode_replace(input: &[u8], fallback_encoding: &'static Encoding)-> (~str, &
 ///     and the `Encoding` object that was used.
 pub fn parse_stylesheet_rules_from_bytes(
         css_bytes: &[u8], protocol_encoding_label: Option<&str>,
-        environment_encoding: Option<&'static Encoding>)
-     -> (StylesheetParser<Tokenizer>, &'static Encoding) {
+        environment_encoding: Option<EncodingObj>)
+     -> (StylesheetParser<Tokenizer>, EncodingObj) {
     let (css_unicode, encoding) = decode_stylesheet_bytes(
         css_bytes, protocol_encoding_label, environment_encoding);
     (parse_stylesheet_rules(tokenize(css_unicode)), encoding)