Skip to content

Update the url crate to 2.0#23838

Merged
bors-servo merged 2 commits intomasterfrom
url-2.0
Aug 17, 2019
Merged

Update the url crate to 2.0#23838
bors-servo merged 2 commits intomasterfrom
url-2.0

Conversation

@SimonSapin SimonSapin added the S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. label Jul 23, 2019
@highfive
Copy link
Copy Markdown

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 highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 23, 2019
@highfive
Copy link
Copy Markdown

warning Warning warning

  • These commits modify net and script code, but no tests are modified. Please consider adding a test!

@bors-servo
Copy link
Copy Markdown
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 27, 2019
@bors-servo
Copy link
Copy Markdown
Contributor

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

@atouchet
Copy link
Copy Markdown
Contributor

url ended up being duped in #23853.

@SimonSapin SimonSapin removed S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. S-needs-rebase There are merge conflict errors. labels Aug 16, 2019
@SimonSapin
Copy link
Copy Markdown
Member Author

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

r? @Manishearth

@jdm
Copy link
Copy Markdown
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 Compare August 16, 2019 13:49
@SimonSapin
Copy link
Copy Markdown
Member Author

This duplicates the ws crate, which is fixed by servo/webrender#3720

@Manishearth
Copy link
Copy Markdown
Member

@bors-servo
Copy link
Copy Markdown
Contributor

📋 Looks like this PR is still in progress, ignoring approval

@highfive highfive assigned Manishearth and unassigned paulrouget Aug 16, 2019
@Manishearth
Copy link
Copy Markdown
Member

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
Copy Markdown
Member Author

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

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

📌 Commit ece1085 has been approved by Manishearth

@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. labels Aug 16, 2019
@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit ece1085 with merge 28c565d...

bors-servo pushed a commit that referenced this pull request Aug 16, 2019
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
Copy Markdown
Contributor

💔 Test failed - linux-rel-wpt

@SimonSapin
Copy link
Copy Markdown
Member Author

Updated expectations for /url.

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

📌 Commit 7d7afb0 has been approved by Manishearth

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. 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. S-awaiting-review There is new code that needs to be reviewed. labels Aug 16, 2019
@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit 7d7afb0 with merge cd46195...

bors-servo pushed a commit that referenced this pull request Aug 16, 2019
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
Copy Markdown
Contributor

💔 Test failed - linux-rel-wpt

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 16, 2019
@jdm
Copy link
Copy Markdown
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>

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Aug 17, 2019
@SimonSapin
Copy link
Copy Markdown
Member Author

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

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

📌 Commit 734fa6d has been approved by Manishearth

@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. labels Aug 17, 2019
@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit 734fa6d with merge 9bba14c...

bors-servo pushed a commit that referenced this pull request Aug 17, 2019
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
Copy Markdown
Contributor

☀️ 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
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 17, 2019
@SimonSapin SimonSapin deleted the url-2.0 branch August 17, 2019 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants