Skip to content

/ servo

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.

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

Update the url crate to 2.0 #23838

Merged
merged 2 commits into from Aug 17, 2019
Merged

Update the url crate to 2.0 #23838

merged 2 commits into from Aug 17, 2019

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Jul 23, 2019 •
edited

Blocked on:

Soft-blocked on: (we could add to the crate duplication allow-list instead)

This change is Reviewable
@highfive
Copy link

highfive commented Jul 23, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/document.rs, components/webdriver_server/Cargo.toml, components/script/Cargo.toml, components/script/dom/htmlformelement.rs, components/script/script_thread.rs
  • @jgraham: components/webdriver_server/Cargo.toml
  • @KiChjang: components/net/Cargo.toml, components/script/dom/document.rs, components/net/data_loader.rs, components/script/Cargo.toml, components/net_traits/lib.rs and 4 more
@highfive
Copy link

highfive commented Jul 23, 2019

warning Warning warning

  • These commits modify net and script code, but no tests are modified. Please consider adding a test!
@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

☔ The latest upstream changes (presumably #23848) made this pull request unmergeable. Please resolve the merge conflicts.
@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2019

☔ The latest upstream changes (presumably #23927) made this pull request unmergeable. Please resolve the merge conflicts.
@atouchet
Copy link
Contributor

atouchet commented Aug 15, 2019

url ended up being duped in #23853.
@SimonSapin SimonSapin force-pushed the url-2.0 branch from ab20d4e to 22b142e Aug 16, 2019
@SimonSapin
Copy link
Member Author

SimonSapin commented Aug 16, 2019

In that case let’s not wait more to land this, the full dedup can come later.

r? @Manishearth
@jdm
Copy link
Member

jdm commented Aug 16, 2019

Taskcluster reports build errors.
@SimonSapin SimonSapin force-pushed the url-2.0 branch 2 times, most recently from 5f9815a to ece1085 Aug 16, 2019
@SimonSapin
Copy link
Member Author

SimonSapin commented Aug 16, 2019

This duplicates the ws crate, which is fixed by servo/webrender#3720
@Manishearth
Copy link
Member

Manishearth commented Aug 16, 2019

@bors-servo r+

https://www.youtube.com/watch?v=h6Uht69h8Is
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2019

📋 Looks like this PR is still in progress, ignoring approval
@highfive highfive assigned Manishearth and unassigned paulrouget Aug 16, 2019
@Manishearth
Copy link
Member

Manishearth commented Aug 16, 2019

merge when ready
@SimonSapin SimonSapin changed the title WIP: Update the url crate to 2.0 Update the url crate to 2.0 Aug 16, 2019
@SimonSapin
Copy link
Member Author

SimonSapin commented Aug 16, 2019

Oh, was that about “WIP” in the title?

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2019

📌 Commit ece1085 has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2019

⌛ Testing commit ece1085 with merge 28c565d...
bors-servo added a commit that referenced this pull request Aug 16, 2019
@bors-servo
Auto merge of #23838 - servo:url-2.0, r=Manishearth
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
28c565d 
Update the url crate to 2.0

Blocked on:

* [x] housleyjk/ws-rs#283 + undoing corresponding `[patch.crates-io]` entry

Soft-blocked on: (we could add to the crate duplication allow-list instead)

* [x] ~rust-windowing/winit#1066
  - [x] rust-windowing/winit#1076
* [x] servo/media#288
* [ ] servo/webrender#3720
* [x] gobwas/influent.rs#22
* [ ] https://bugzilla.mozilla.org/show_bug.cgi?id=1568540
  - [x] seanmonstar/warp#260
  - [ ] abonander/multipart#121

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

bors-servo commented Aug 16, 2019

💔 Test failed - linux-rel-wpt
@SimonSapin SimonSapin force-pushed the url-2.0 branch from ece1085 to 7d7afb0 Aug 16, 2019
@SimonSapin
Copy link
Member Author

SimonSapin commented Aug 16, 2019

Updated expectations for /url.

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2019

📌 Commit 7d7afb0 has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2019

⌛ Testing commit 7d7afb0 with merge cd46195...
bors-servo added a commit that referenced this pull request Aug 16, 2019
@bors-servo
Auto merge of #23838 - servo:url-2.0, r=Manishearth
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cd46195 
Update the url crate to 2.0

Blocked on:

* [x] housleyjk/ws-rs#283 + undoing corresponding `[patch.crates-io]` entry

Soft-blocked on: (we could add to the crate duplication allow-list instead)

* [x] ~rust-windowing/winit#1066
  - [x] rust-windowing/winit#1076
* [x] servo/media#288
* [ ] servo/webrender#3720
* [x] gobwas/influent.rs#22
* [ ] https://bugzilla.mozilla.org/show_bug.cgi?id=1568540
  - [x] seanmonstar/warp#260
  - [ ] abonander/multipart#121

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

bors-servo commented Aug 16, 2019

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented Aug 16, 2019 


  ▶ Unexpected subtest result in /url/url-setters.html:
  └ PASS [expected FAIL] URL: Setting <https://x/>.host = '\xdf' IDNA Nontransitional_Processing

  ▶ Unexpected subtest result in /url/url-setters.html:
  └ PASS [expected FAIL] <a>: Setting <https://x/>.host = '\xdf' IDNA Nontransitional_Processing

  ▶ Unexpected subtest result in /url/url-constructor.html:
  └ PASS [expected FAIL] Parsing: <https://fa\xdf.ExAmPlE/> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <https://fa\xdf.ExAmPlE/> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <https://fa\xdf.ExAmPlE/> against <about:blank>


  ▶ Unexpected subtest result in /url/url-origin.html:
  └ PASS [expected FAIL] Origin parsing: <https://fa\xdf.ExAmPlE/> against <about:blank>
SimonSapin added 2 commits Jul 16, 2019
@SimonSapin
Update to url 2.0
9392180
@SimonSapin
Update to percent-encoding 2.0
Loading status checks…
734fa6d
@SimonSapin SimonSapin force-pushed the url-2.0 branch from 7d7afb0 to 734fa6d Aug 17, 2019
@SimonSapin
Copy link
Member Author

SimonSapin commented Aug 17, 2019

Not sure how those expectations weren’t updated in the previous run…

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2019

📌 Commit 734fa6d has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2019

⌛ Testing commit 734fa6d with merge 9bba14c...
bors-servo added a commit that referenced this pull request Aug 17, 2019
@bors-servo
Auto merge of #23838 - servo:url-2.0, r=Manishearth
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9bba14c 
Update the url crate to 2.0

Blocked on:

* [x] housleyjk/ws-rs#283 + undoing corresponding `[patch.crates-io]` entry

Soft-blocked on: (we could add to the crate duplication allow-list instead)

* [x] ~rust-windowing/winit#1066
  - [x] rust-windowing/winit#1076
* [x] servo/media#288
* [ ] servo/webrender#3720
* [x] gobwas/influent.rs#22
* [ ] https://bugzilla.mozilla.org/show_bug.cgi?id=1568540
  - [x] seanmonstar/warp#260
  - [ ] abonander/multipart#121

<!-- 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/23838)
<!-- Reviewable:end -->
@SimonSapin SimonSapin mentioned this pull request Aug 17, 2019
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: Manishearth
Pushing 9bba14c to master...
@bors-servo bors-servo merged commit 734fa6d into master Aug 17, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Aug 17, 2019
Merged
3 of 3 tasks complete
@SimonSapin SimonSapin deleted the url-2.0 branch Aug 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@SimonSapin @highfive @bors-servo @atouchet @jdm @Manishearth @paulrouget
You can’t perform that action at this time.