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

2.0 #517

Merged
merged 43 commits into from
Jul 17, 2019
Merged

2.0 #517

merged 43 commits into from
Jul 17, 2019

Conversation

SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Jul 15, 2019

This change is Reviewable

nox and others added 30 commits February 11, 2019 13:23
Hyphens are checked by default.
url crate: remove rustc-serialize optional dependency

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/507)
<!-- Reviewable:end -->
It is deprecated since 1.26.0 if the inherent
methods, that are stable since 1.23.0,
want to be relied on.
This requires at least rustc 1.24.0 as only then the function
became stably const-fn.
The 1.24.0 release has been over a year ago
and is needed by the prior commits.
Update to serde 1.0

<!-- 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/512)
<!-- Reviewable:end -->
Make the tests use serde_json instead of rustc_serialize

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/514)
<!-- Reviewable:end -->
@nox
Copy link
Contributor

nox commented Jul 17, 2019

r+ your commits, let's merge it on 2.0 so we can continue making changes there.

@SimonSapin
Copy link
Member Author

This is the 2.0 branch.

@nox
Copy link
Contributor

nox commented Jul 17, 2019

Yeah I know, I meant we should merge it so we can make other PRs against 2.0, sorry that wasn't clear.

@SimonSapin
Copy link
Member Author

Per IRC discussion:

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit 50c3efe has been approved by nox

bors-servo pushed a commit that referenced this pull request Jul 17, 2019
2.0

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

⌛ Testing commit 50c3efe with merge 6c76f2e...

@bors-servo
Copy link
Contributor

☀️ Test successful - checks-travis
Approved by: nox
Pushing 6c76f2e to master...

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.

4 participants