Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4889 : Ms2ger/servo/4747-base64, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-02-10 07:24:45 -07:00
commit 58b7186cea
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/net/data_loader.rs
View file

@ -5,7 +5,7 @@
use resource_task::{Metadata, LoadData, TargetedLoadResponse, start_sending, ResponseSenders};
use resource_task::ProgressMsg::{Payload, Done};
use serialize::base64::FromBase64;
use rustc_serialize::base64::FromBase64;
use hyper::mime::Mime;
use url::{percent_decode, SchemeData};

2
components/net/lib.rs
View file

@ -17,7 +17,7 @@ extern crate png;
#[macro_use]
extern crate log;
extern crate openssl;
extern crate serialize;
extern crate "rustc-serialize" as rustc_serialize;
extern crate util;
extern crate stb_image;
extern crate time;

2
components/script/dom/window.rs
View file

@ -47,7 +47,7 @@ use js::rust::with_compartment;
use url::{Url, UrlParser};
use libc;
use serialize::base64::{FromBase64, ToBase64, STANDARD};
use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD};
use std::cell::{Ref, RefMut};
use std::default::Default;
use std::ffi::CString;

2
components/script/lib.rs
View file

@ -26,7 +26,7 @@ extern crate js;
extern crate libc;
extern crate msg;
extern crate net;
extern crate serialize;
extern crate "rustc-serialize" as rustc_serialize;
extern crate time;
extern crate canvas;
extern crate script_traits;