diff options
| author | Keegan McAllister <mcallister.keegan@gmail.com> | 2014-09-20 15:35:08 -0700 |
|---|---|---|
| committer | Keegan McAllister <mcallister.keegan@gmail.com> | 2014-09-20 15:35:08 -0700 |
| commit | 045328c8e94f5bdfcd67105c5dfa9209f4cd501c (patch) | |
| tree | 1d5f8d958e12ae59e0ac720a7873e3c3b08cb1e8 /components/net/image_cache_task.rs | |
| parent | d6ba37c68c34a3748a789caeca225083275757e5 (diff) | |
| parent | a40b94d7f946d75e1a66af206efda9879b89c707 (diff) | |
| download | servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.tar.gz servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.zip | |
Merge pull request #3438 from servo/rustup
Upgrade Rust
Diffstat (limited to 'components/net/image_cache_task.rs')
| -rw-r--r-- | components/net/image_cache_task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs index de0c978c3cf..cf0cb9a0bd2 100644 --- a/components/net/image_cache_task.rs +++ b/components/net/image_cache_task.rs @@ -76,7 +76,7 @@ impl<E, S: Encoder<E>> Encodable<S, E> for ImageCacheTask { } } -type DecoderFactory = fn() -> proc(&[u8]) -> Option<Image>; +type DecoderFactory = fn() -> (proc(&[u8]) : 'static -> Option<Image>); impl ImageCacheTask { pub fn new(resource_task: ResourceTask) -> ImageCacheTask { @@ -464,7 +464,7 @@ fn load_image_data(url: Url, resource_task: ResourceTask) -> Result<Vec<u8>, ()> image_data.push_all(data.as_slice()); } resource_task::Done(result::Ok(..)) => { - return Ok(image_data.move_iter().collect()); + return Ok(image_data.into_iter().collect()); } resource_task::Done(result::Err(..)) => { return Err(()); |