diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-09 18:14:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-09 18:14:30 -0500 |
commit | 6f9016cf3edce828bf0edb5411b963d7c9f2d209 (patch) | |
tree | 3be1d020b5ab5220393e075bf7af0843d257c932 /components/net_traits/blob_url_store.rs | |
parent | ebb1cb30f758273ba3efbe1e1ae3a504faed8293 (diff) | |
parent | f8fa9aaf422d8bfca757d835bc073e769ed8e003 (diff) | |
download | servo-6f9016cf3edce828bf0edb5411b963d7c9f2d209.tar.gz servo-6f9016cf3edce828bf0edb5411b963d7c9f2d209.zip |
Auto merge of #11552 - izgzhen:add-testing-fix-filemanager, r=Manishearth
Improve implementation and add testing regarding file manager thread
First there is a more completed unit test. And in the test running, I found a runtime error `Serde(Custom("bincode does not support Deserializer::deserialize))` when reading response from file manage thread. I analyzed a bit and found that it is probably caused by the `Uuid` field. I temporarily work around it by making the `Id` essentially a string wrapped inside `SelectedFileId`.
Related to PR #11131.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
<!-- Either: -->
- [x] There are tests for these changes
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11552)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net_traits/blob_url_store.rs')
-rw-r--r-- | components/net_traits/blob_url_store.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/components/net_traits/blob_url_store.rs b/components/net_traits/blob_url_store.rs index 85fa81aa341..71d8c11b2de 100644 --- a/components/net_traits/blob_url_store.rs +++ b/components/net_traits/blob_url_store.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use ipc_channel::ipc::IpcSender; use std::str::FromStr; use url::Url; use uuid::Uuid; @@ -29,13 +28,6 @@ pub struct BlobURLStoreEntry { pub bytes: Vec<u8>, } -/// Message-passing style interface between store and loader -#[derive(Serialize, Deserialize)] -pub enum BlobURLStoreMsg { - /// Request for an blob entry identified by uuid - Request(Uuid, IpcSender<Result<BlobURLStoreEntry, BlobURLStoreError>>), -} - /// Parse URL as Blob URL scheme's definition /// https://w3c.github.io/FileAPI/#DefinitionOfScheme pub fn parse_blob_url(url: &Url) -> Option<(Uuid, Option<&str>)> { |