diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-03-21 18:44:39 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-03-21 18:44:39 +0100 |
commit | ba87666cdbf4addf9340aad0dd0cf9574b79091c (patch) | |
tree | 6a7b6b4d0a28f0302029f0c82ab3c63290287d6e /components/net/data_loader.rs | |
parent | 29a36adbe7d87fb38ba9bef3a718c6c823fb5977 (diff) | |
download | servo-ba87666cdbf4addf9340aad0dd0cf9574b79091c.tar.gz servo-ba87666cdbf4addf9340aad0dd0cf9574b79091c.zip |
Update some code that's feature-gated under core.
Diffstat (limited to 'components/net/data_loader.rs')
-rw-r--r-- | components/net/data_loader.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/net/data_loader.rs b/components/net/data_loader.rs index d430e3e4eb4..2b75d238053 100644 --- a/components/net/data_loader.rs +++ b/components/net/data_loader.rs @@ -22,7 +22,7 @@ pub fn factory(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) { fn load(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) { let url = load_data.url; - assert!("data" == url.scheme.as_slice()); + assert!(&*url.scheme == "data"); let mut metadata = Metadata::default(url.clone()); @@ -39,11 +39,11 @@ fn load(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) { match url.query { Some(query) => { scheme_data.push_str("?"); - scheme_data.push_str(query.as_slice()); + scheme_data.push_str(&query); }, None => () } - let parts: Vec<&str> = scheme_data.as_slice().splitn(1, ',').collect(); + let parts: Vec<&str> = scheme_data.splitn(1, ',').collect(); if parts.len() != 2 { start_sending(senders, metadata).send(Done(Err("invalid data uri".to_string()))).unwrap(); return; @@ -70,7 +70,7 @@ fn load(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) { // FIXME(#2909): It’s unclear what to do with non-alphabet characters, // but Acid 3 apparently depends on spaces being ignored. let bytes = bytes.into_iter().filter(|&b| b != ' ' as u8).collect::<Vec<u8>>(); - match bytes.as_slice().from_base64() { + match bytes.from_base64() { Err(..) => { progress_chan.send(Done(Err("non-base64 data uri".to_string()))).unwrap(); } |