Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support OpenEndedDictionary (Mozmap) in the Headers #13356

Merged
merged 1 commit into from Sep 23, 2016
Merged

Support OpenEndedDictionary (Mozmap) in the Headers #13356

merged 1 commit into from Sep 23, 2016

Conversation

jeenalee
Copy link
Contributor

@jeenalee jeenalee commented Sep 21, 2016 •
edited

This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix Implement the Headers API #11897 (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/request.rs, components/script/dom/bindings/mozmap.rs, components/script/dom/webidls/Headers.webidl, components/script/dom/headers.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 21, 2016
@jeenalee
Copy link
Contributor Author

r? @jdm

@highfive highfive assigned jdm and unassigned larsbergstrom Sep 21, 2016
jdm
jdm requested changes Sep 21, 2016
View reviewed changes
Copy link
Member

@jdm jdm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm operating under the assumption that all of the tests now timing out require Promises. These changes look good!

components/script/dom/request.rs
@@ -14,7 +14,7 @@ use dom::bindings::codegen::Bindings::RequestBinding::RequestMethods;
use dom::bindings::codegen::Bindings::RequestBinding::RequestMode;
use dom::bindings::codegen::Bindings::RequestBinding::RequestRedirect;
use dom::bindings::codegen::Bindings::RequestBinding::RequestType;
use dom::bindings::codegen::UnionTypes::HeadersOrByteStringSequenceSequence;
use dom::bindings::codegen::UnionTypes::HeadersOrByteStringSequenceSequenceOrByteStringMozMap as HeadersInitType;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: extra space before as.

components/script/dom/request.rs
&HeadersInitType::ByteStringSequenceSequence(ref b) =>
HeadersInitType::ByteStringSequenceSequence(b.clone()),
&HeadersInitType::ByteStringMozMap(ref m) =>
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

&HeadersInitType::ByteStringMozMap(ref m) =>
    HeadersInitType::ByteStringMozMap(m.clone())

@jdm jdm added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 21, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Sep 21, 2016
KiChjang
KiChjang reviewed Sep 22, 2016
View reviewed changes
components/script/dom/request.rs
@@ -14,7 +14,7 @@ use dom::bindings::codegen::Bindings::RequestBinding::RequestMethods;
use dom::bindings::codegen::Bindings::RequestBinding::RequestMode;
use dom::bindings::codegen::Bindings::RequestBinding::RequestRedirect;
use dom::bindings::codegen::Bindings::RequestBinding::RequestType;
use dom::bindings::codegen::UnionTypes::HeadersOrByteStringSequenceSequence;
use dom::bindings::codegen::UnionTypes::HeadersOrByteStringSequenceSequenceOrByteStringMozMap as HeadersInitType;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... dom::bindings::codegen::Bindings::RequestBinding should re-export this union type as HeadersInit. Have you tried importing that instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right! Fixing it right now. Thanks!

@jdm
Copy link
Member

jdm commented Sep 22, 2016

I'm going to hold off merging this until after Promises, since there's a lot of overlap between the test result changes.

@jdm jdm added S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 22, 2016
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #12830) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Sep 22, 2016
@jdm jdm removed the S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. label Sep 22, 2016
@jdm
Copy link
Member

jdm commented Sep 22, 2016

If you rebase, I will merge :)

@jdm
Copy link
Member

jdm commented Sep 22, 2016

Oh, and go ahead and squash the commits into one.

@jdm jdm added S-needs-squash Some (or all) of the commits in the PR should be combined. and removed S-needs-rebase There are merge conflict errors. labels Sep 22, 2016
@jdm
Copy link
Member

jdm commented Sep 22, 2016

@bors-servo: delegate+

@bors-servo
Copy link
Contributor

✌️ @jeenalee can now approve this pull request

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 22, 2016
@jeenalee
Enable OpenEndedDictionary in Headers
3b75d22 
Expected wpt results are updated as well.
@jeenalee
Copy link
Contributor Author

@bors-servo: r=jdm

@bors-servo
Copy link
Contributor

📌 Commit 3b75d22 has been approved by jdm

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-squash Some (or all) of the commits in the PR should be combined. labels Sep 22, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 3b75d22 with merge 68e7ff3...

bors-servo pushed a commit that referenced this pull request Sep 22, 2016
Auto merge of #13356 - jeenalee:mozmap-headers, r=jdm
68e7ff3 
Support OpenEndedDictionary (Mozmap) in the Headers

<!-- Please describe your changes on the following line: -->

This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API.

---
<!-- 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 #11897  (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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/13356)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel

@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 23, 2016
@highfive
Copy link 

  ▶ Unexpected subtest result in /_mozilla/mozilla/promise.html:
  │ FAIL [expected PASS] Native promise from async callback can be resolved
  │   → assert_true: expected true got false
  │ 
  └ @http://web-platform.test:8000/_mozilla/mozilla/promise.html:58:11

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Sep 23, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Sep 23, 2016 •
edited

@bors-servo retry #13384

@bors-servo
Copy link
Contributor

⌛ Testing commit 3b75d22 with merge 0ecaa77...

bors-servo pushed a commit that referenced this pull request Sep 23, 2016
Auto merge of #13356 - jeenalee:mozmap-headers, r=jdm
0ecaa77 
Support OpenEndedDictionary (Mozmap) in the Headers

<!-- Please describe your changes on the following line: -->

This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API.

---
<!-- 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 #11897  (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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/13356)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Sep 23, 2016
bors-servo pushed a commit that referenced this pull request Sep 23, 2016
Auto merge of #13356 - jeenalee:mozmap-headers, r=jdm
06f7a64 
Support OpenEndedDictionary (Mozmap) in the Headers

<!-- Please describe your changes on the following line: -->

This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API.

---
<!-- 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 #11897  (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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/13356)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

⌛ Testing commit 3b75d22 with merge 06f7a64...

@bors-servo bors-servo mentioned this pull request Sep 23, 2016
Merged
5 tasks
@bors-servo
Copy link
Contributor

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

@bors-servo bors-servo merged commit 3b75d22 into servo:master Sep 23, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KiChjang KiChjang KiChjang left review comments

@jdm jdm jdm requested changes

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement the Headers API
7 participants
@jeenalee @highfive @jdm @bors-servo @Ms2ger @KiChjang @larsbergstrom