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

Upgrade to Rust 2018; some cleanups #426

Merged
merged 6 commits into from Apr 10, 2020
Merged

Conversation

@hannobraun
Copy link
Contributor

hannobraun commented Apr 10, 2020

No description provided.

hannobraun added 4 commits Apr 10, 2020
This is a fully automatic change, running `cargo fix --edition`. I've
done a quick review and everything looks fine to me.
I believe this is the idiomatic way to do it with the 2018 edition. I
think it's worth the slight increase in verbosity, as it's much more
clear where the derive macros come from.
@hannobraun
Copy link
Contributor Author

hannobraun commented Apr 10, 2020

CI fails for Rust 1.31.0. I'm looking into it.

hannobraun added 2 commits Apr 10, 2020
Doc tests failed to compile because of this on Rust 1.31.0 (on probably
other older versions too). The compiler complained about `core` being
defined multiple times.

I don't quite understand what was going on there, but the re-export
wasn't necessary and this seems cleaner anyway.
I'm sure it served a purpose at some point, but as far as I can tell,
everything seems to work without it now.
@hannobraun
Copy link
Contributor Author

hannobraun commented Apr 10, 2020

Pushed two additional clean-up commits, the first of which fixes the CI build.

@nical
Copy link
Collaborator

nical commented Apr 10, 2020

Looks good, thanks!

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

📌 Commit 037dffa has been approved by nical

@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

Testing commit 037dffa with merge 1b79711...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 10, 2020

☀️ Test successful - checks-travis
Approved by: nical
Pushing 1b79711 to master...

@bors-servo bors-servo merged commit 1b79711 into servo:master Apr 10, 2020
2 checks passed
2 checks passed
Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@hannobraun hannobraun deleted the hannobraun:rust-2018 branch Apr 11, 2020
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.