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.

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

Move tests of idna to serde-json #518

Merged
merged 1 commit into from Jul 18, 2019
Merged

Move tests of idna to serde-json #518

merged 1 commit into from Jul 18, 2019

Conversation

@est31
Copy link
Contributor

est31 commented Jul 17, 2019

Part of #506


This change is Reviewable

@est31 est31 mentioned this pull request Jul 17, 2019
3 of 3 tasks complete
@est31 est31 changed the title Move tests of idna to rustc-serialize Move tests of idna to serde-json Jul 17, 2019
@est31 est31 force-pushed the est31:idna_serde branch from 78d5be9 to d914c8e Jul 17, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2019

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

@est31 est31 force-pushed the est31:idna_serde branch from d914c8e to 297606c Jul 17, 2019
@nox
Copy link
Member

nox commented Jul 18, 2019

Cool.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2019

📌 Commit 297606c has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2019

Testing commit 297606c with merge 3c71cac...

bors-servo added a commit that referenced this pull request Jul 18, 2019
Move tests of idna to serde-json

Part of #506

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-url/518)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2019

☀️ Test successful - checks-travis
Approved by: nox
Pushing 3c71cac to master...

@bors-servo bors-servo merged commit 297606c into servo:master Jul 18, 2019
3 checks passed
3 checks passed
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.