diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-27 19:45:09 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-27 19:45:09 -0600 |
| commit | 2672f2bbe46fd833c6a84b70edaa99dcaf092b5c (patch) | |
| tree | 80581d5bda37782f1c7ce2d3854e6c0cfcf69e6a /components/script/dom/blob.rs | |
| parent | 1eeb05d914bcec1b4839b3f0be7b13c98b711783 (diff) | |
| parent | 572616605a9cd5f97d65f0944785447f3fd2d5a6 (diff) | |
| download | servo-2672f2bbe46fd833c6a84b70edaa99dcaf092b5c.tar.gz servo-2672f2bbe46fd833c6a84b70edaa99dcaf092b5c.zip | |
Auto merge of #6782 - notriddle:empty-vec, r=jdm
Use empty Vec instead of None.
Closes #6764
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6782)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/blob.rs')
| -rw-r--r-- | components/script/dom/blob.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index bfa85bb5784..7e2d539d163 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -82,14 +82,14 @@ impl Blob { } pub trait BlobHelpers { - fn read_out_buffer(self) -> Receiver<Option<Vec<u8>>> ; + fn read_out_buffer(self) -> Receiver<Vec<u8>>; fn read_out_type(self) -> DOMString; } impl<'a> BlobHelpers for &'a Blob { - fn read_out_buffer(self) -> Receiver<Option<Vec<u8>>> { + fn read_out_buffer(self) -> Receiver<Vec<u8>> { let (send, recv) = mpsc::channel(); - send.send(self.bytes.clone()).unwrap(); + send.send(self.bytes.clone().unwrap_or(vec![])).unwrap(); recv } fn read_out_type(self) -> DOMString { |