diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-10-15 08:33:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-15 08:33:46 -0400 |
commit | c5d6bb604d8d03d775cfc59e8bf2afdda2301e7d (patch) | |
tree | 744a1b430cc2de4d20b3dd3bfa88169b84c9d719 /components/script/dom/request.rs | |
parent | 1f6402465579e787e63b34b24ac46593c27c2f3d (diff) | |
parent | b697621b05d5c0b741d377637cb9c16ef31986b9 (diff) | |
download | servo-c5d6bb604d8d03d775cfc59e8bf2afdda2301e7d.tar.gz servo-c5d6bb604d8d03d775cfc59e8bf2afdda2301e7d.zip |
Auto merge of #24377 - saschanaz:record-support, r=nox
Support WebIDL `record<>`
<!-- Please describe your changes on the following line: -->
Rebased @taki-zaro's work (#20318).
---
<!-- 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 #15012 and closes #20318. Possibly also closes #21463.
<!-- Either: -->
- [x] There are tests for these changes
<!-- 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. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24377)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/request.rs')
-rw-r--r-- | components/script/dom/request.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index b777dd0cb56..5393288c633 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -311,9 +311,10 @@ impl Request { init_sequence.clone(), )))?; }, - &HeadersInit::StringByteStringRecord(ref init_map) => { - headers_copy - .fill(Some(HeadersInit::StringByteStringRecord(init_map.clone())))?; + &HeadersInit::ByteStringByteStringRecord(ref init_map) => { + headers_copy.fill(Some(HeadersInit::ByteStringByteStringRecord( + init_map.clone(), + )))?; }, } } @@ -859,8 +860,8 @@ impl Clone for HeadersInit { &HeadersInit::ByteStringSequenceSequence(ref b) => { HeadersInit::ByteStringSequenceSequence(b.clone()) }, - &HeadersInit::StringByteStringRecord(ref m) => { - HeadersInit::StringByteStringRecord(m.clone()) + &HeadersInit::ByteStringByteStringRecord(ref m) => { + HeadersInit::ByteStringByteStringRecord(m.clone()) }, } } |