Support OpenEndedDictionary (Mozmap) in the Headers #13356

jeenalee · 2016-09-21T18:24:28Z

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

There are tests for these changes OR
These changes do not require tests because _____

This change is

highfive · 2016-09-21T18:24:31Z

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

jeenalee · 2016-09-21T18:24:42Z

r? @jdm

jdm

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

jdm · 2016-09-21T18:39:21Z

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;


nit: extra space before as.

jdm · 2016-09-21T18:39:21Z

components/script/dom/request.rs

+        &HeadersInitType::ByteStringSequenceSequence(ref b) =>
+            HeadersInitType::ByteStringSequenceSequence(b.clone()),
+        &HeadersInitType::ByteStringMozMap(ref m) =>
+        {


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

KiChjang · 2016-09-22T18:49:38Z

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;


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

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

jdm · 2016-09-22T19:13:08Z

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

bors-servo · 2016-09-22T21:39:10Z

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

jdm · 2016-09-22T21:58:00Z

If you rebase, I will merge :)

jdm · 2016-09-22T21:58:13Z

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

jdm · 2016-09-22T21:59:26Z

@bors-servo: delegate+

bors-servo · 2016-09-22T21:59:27Z

✌️ @jeenalee can now approve this pull request


        Enable OpenEndedDictionary in Headers

Expected wpt results are updated as well.

jeenalee · 2016-09-22T22:05:39Z

@bors-servo: r=jdm

bors-servo · 2016-09-22T22:05:40Z

📌 Commit 3b75d22 has been approved by jdm

bors-servo · 2016-09-22T23:15:42Z

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


        Auto merge of #13356 - jeenalee:mozmap-headers, r=jdm

Support OpenEndedDictionary (Mozmap) in the Headers  This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API. ---  - [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).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13356)

bors-servo · 2016-09-23T00:15:52Z

💔 Test failed - linux-rel

highfive · 2016-09-23T00:15:55Z

  ▶ 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

Ms2ger · 2016-09-23T09:09:46Z

@bors-servo retry #13384

bors-servo · 2016-09-23T09:25:18Z

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


        Auto merge of #13356 - jeenalee:mozmap-headers, r=jdm

Support OpenEndedDictionary (Mozmap) in the Headers  This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API. ---  - [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).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13356)


        Auto merge of #13356 - jeenalee:mozmap-headers, r=jdm

Support OpenEndedDictionary (Mozmap) in the Headers  This PR will support OpenEndedDictionary (based on MozMap implementation from #13332) in the Headers API. ---  - [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).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13356)

bors-servo · 2016-09-23T09:40:22Z

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

bors-servo · 2016-09-23T11:08:59Z

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

highfive assigned larsbergstrom Sep 21, 2016

highfive added the S-awaiting-review label Sep 21, 2016

highfive assigned jdm and unassigned larsbergstrom Sep 21, 2016

jdm requested changes Sep 21, 2016

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Sep 21, 2016

jeenalee force-pushed the jeenalee:mozmap-headers branch from e0051b0 to e5eea2a Sep 21, 2016

highfive added S-awaiting-review and removed S-needs-code-changes labels Sep 21, 2016

KiChjang reviewed Sep 22, 2016

View changes

jdm added S-blocked-on-external and removed S-awaiting-review labels Sep 22, 2016

highfive added the S-needs-rebase label Sep 22, 2016

jdm removed the S-blocked-on-external label Sep 22, 2016

jdm added S-needs-squash and removed S-needs-rebase labels Sep 22, 2016

jeenalee force-pushed the jeenalee:mozmap-headers branch from e5eea2a to 7577c3f Sep 22, 2016

highfive added the S-awaiting-review label Sep 22, 2016

Enable OpenEndedDictionary in Headers

Loading status checks…

3b75d22

Expected wpt results are updated as well.

jeenalee force-pushed the jeenalee:mozmap-headers branch from 7577c3f to 3b75d22 Sep 22, 2016

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-squash labels Sep 22, 2016

highfive removed the S-awaiting-merge label Sep 23, 2016

highfive added the S-tests-failed label Sep 23, 2016

highfive added S-awaiting-merge and removed S-tests-failed labels Sep 23, 2016

bors-servo mentioned this pull request Sep 23, 2016

Flush style sharing cache on parent mismatch. #13312

Merged

4 of 5 tasks complete

bors-servo merged commit 3b75d22 into servo:master Sep 23, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Sep 23, 2016

servo / servo

Support OpenEndedDictionary (Mozmap) in the Headers #13356

Support OpenEndedDictionary (Mozmap) in the Headers #13356

jeenalee commented Sep 21, 2016 •

edited

highfive commented Sep 21, 2016

jeenalee commented Sep 21, 2016

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jdm commented Sep 22, 2016

bors-servo commented Sep 22, 2016

jdm commented Sep 22, 2016

jdm commented Sep 22, 2016

jdm commented Sep 22, 2016

bors-servo commented Sep 22, 2016

jeenalee commented Sep 22, 2016

bors-servo commented Sep 22, 2016

bors-servo commented Sep 22, 2016

bors-servo commented Sep 23, 2016

highfive commented Sep 23, 2016

Ms2ger commented Sep 23, 2016 •

edited

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

servo / servo

Join GitHub today

Support OpenEndedDictionary (Mozmap) in the Headers #13356

Support OpenEndedDictionary (Mozmap) in the Headers #13356

Conversation

jeenalee commented Sep 21, 2016 • edited

highfive commented Sep 21, 2016

jeenalee commented Sep 21, 2016

jdm left a comment

This comment has been minimized.

jdm Sep 21, 2016

This comment has been minimized.

jdm Sep 21, 2016

This comment has been minimized.

KiChjang Sep 22, 2016

This comment has been minimized.

jeenalee Sep 22, 2016

jdm commented Sep 22, 2016

bors-servo commented Sep 22, 2016

jdm commented Sep 22, 2016

jdm commented Sep 22, 2016

jdm commented Sep 22, 2016

bors-servo commented Sep 22, 2016

jeenalee commented Sep 22, 2016

bors-servo commented Sep 22, 2016

bors-servo commented Sep 22, 2016

bors-servo commented Sep 23, 2016

highfive commented Sep 23, 2016

Ms2ger commented Sep 23, 2016 • edited

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

jeenalee commented Sep 21, 2016 •

edited

Ms2ger commented Sep 23, 2016 •

edited