diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-12-19 10:10:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-19 10:10:15 -0500 |
commit | aa36d5f657eb32b59d994d08b177a02372b4b01c (patch) | |
tree | c59e1285467e3dc3070b68345a7993851aae12d4 /components/script/dom/bindings/serializable.rs | |
parent | 1a31e495a19b364d98b2eae9c2718e098bfc0bde (diff) | |
parent | 5c3bda025144118fc8dd67a3f975d8f91fd25e78 (diff) | |
download | servo-aa36d5f657eb32b59d994d08b177a02372b4b01c.tar.gz servo-aa36d5f657eb32b59d994d08b177a02372b4b01c.zip |
Auto merge of #25338 - warren-fisher:master, r=jdm
Remove Optional pipeline_id
<!-- Please describe your changes on the following line: -->
All code that creates a WorkerScriptLoadOrigin passes a Some value for the pipeline, so we should remove the Option from the struct member field.
I changed the `WorkerScriptLoadOrigin` struct in `components/script_traits/lib.rs` to have a PipelineId and not an Option<PipelineId>. In `components/script/dom/worker.rs` and `components/script/dom/serviceworkerregistration.rs` it was changed so that `WorkerScriptLoadOrigin` was instantiated with a non-Optional. In `components/script/dom/dedicatedworkerglobalscope.rs` testing for if pipeline_id is an Optional is removed.
In `components/script/dom/serviceworkerglobalscope.rs` and `components/script/dom/dedicatedworkerglobalscope.rs` a `PipelineId` was provided as an Optional to a `RequestBuilder` and I changed it to provide a `Some(pipeline_id)` instead. I am not sure changing the [RequestBuilder struct](https://github.com/warren-fisher/servo/blob/5c3bda025144118fc8dd67a3f975d8f91fd25e78/components/net_traits/request.rs#L118-L159) at line 147 to accept a non-optional was within this issue so I left it as is.
I was able to successfully build it so I assume these changes worked, however I am not sure about the implications of the changes made in the unsafe block in `components/script/dom/dedicatedworkerglobalscope.rs`.
<!-- 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
- [x] These changes fix #24772 (GitHub issue number if applicable)
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the issue says so
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/bindings/serializable.rs')
0 files changed, 0 insertions, 0 deletions