Auto merge of #16137 - nox:die-rustc-serialize-die, r=emilio

Replace use of rustc_serialize::base64 by base64

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16137)
<!-- Reviewable:end -->

components/net/Cargo.toml

@@ -10,6 +10,7 @@ name = "net"
 path = "lib.rs"
 
 [dependencies]
+base64 = "0.4.1"
 brotli = "1.0.6"
 cookie = "0.2.5"
 devtools_traits = {path = "../devtools_traits"}
@@ -27,7 +28,6 @@ net_traits = {path = "../net_traits"}
 openssl = "0.7.6"
 openssl-verify = "0.1"
 profile_traits = {path = "../profile_traits"}
-rustc-serialize = "0.3"
 serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"

components/net/data_loader.rs

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use base64;
 use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value};
-use rustc_serialize::base64::FromBase64;
 use servo_url::ServoUrl;
 use url::Position;
 use url::percent_encoding::percent_decode;
@@ -46,7 +46,7 @@ pub fn decode(url: &ServoUrl) -> Result<DecodeData, DecodeError> {
         // FIXME(#2909): It’s unclear what to do with non-alphabet characters,
         // but Acid 3 apparently depends on spaces being ignored.
         bytes = bytes.into_iter().filter(|&b| b != b' ').collect::<Vec<u8>>();
-        match bytes.from_base64() {
+        match base64::decode(&bytes) {
             Err(..) => return Err(DecodeError::NonBase64DataUri),
             Ok(data) => bytes = data,
         }

components/net/lib.rs

@@ -7,6 +7,7 @@
 #![feature(mpsc_select)]
 #![feature(step_by)]
 
+extern crate base64;
 extern crate brotli;
 extern crate cookie as cookie_rs;
 extern crate devtools_traits;
@@ -25,7 +26,6 @@ extern crate net_traits;
 extern crate openssl;
 extern crate openssl_verify;
 extern crate profile_traits;
-extern crate rustc_serialize;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;

components/net/subresource_integrity.rs

@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use base64;
 use net_traits::response::{Response, ResponseBody, ResponseType};
 use openssl::crypto::hash::{hash, Type as MessageDigest};
-use rustc_serialize::base64::{STANDARD, ToBase64};
 use std::iter::Filter;
 use std::str::Split;
 use std::sync::MutexGuard;
@@ -120,7 +120,7 @@ fn apply_algorithm_to_response(body: MutexGuard<ResponseBody>,
                                -> String {
     if let ResponseBody::Done(ref vec) = *body {
         let response_digest = hash(message_digest, vec);
-        response_digest.to_base64(STANDARD)
+        base64::encode(&response_digest)
     } else {
         unreachable!("Tried to calculate digest of incomplete response body")
     }