diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
| commit | f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8 (patch) | |
| tree | 7e7fbd7976c3da12ff463d6ffbeb1a3a336ae7d3 /src/components/net/data_loader.rs | |
| parent | caf1ed94468da3c134cc8e8f4a1b934bb353dc19 (diff) | |
| parent | a6100563a6e43471ae43fb155113bc2026992f78 (diff) | |
| download | servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.tar.gz servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.zip | |
auto merge of #1934 : larsbergstrom/servo/rust_20140224_squashed, r=jdm
For review only - don't approve yet (need to squash and land submodule updates first).
critic? @metajack
Diffstat (limited to 'src/components/net/data_loader.rs')
| -rw-r--r-- | src/components/net/data_loader.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/net/data_loader.rs b/src/components/net/data_loader.rs index 881b6b28bf6..3feaa80ff6c 100644 --- a/src/components/net/data_loader.rs +++ b/src/components/net/data_loader.rs @@ -5,7 +5,7 @@ use resource_task::{Done, Payload, Metadata, LoadResponse, LoaderTask, start_sending}; use extra::url::Url; -use extra::base64::FromBase64; +use serialize::base64::FromBase64; use http::headers::test_utils::from_stream_with_str; use http::headers::content_type::MediaType; |