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

Begin preparation for Rust 2018 #1467

Merged
merged 4 commits into from
Aug 30, 2018

Conversation

jtgeibel
Copy link
Member

This PR captures some of the results of my experimentation with cargo fix. The first 2 commits are required in order to get cargo fix to apply cleanly. In addition to these changes, there are 3 macros which cause problems in the automated conversion. I have not incorporated the fix for these macros because the crate keyword cannot be used in paths on current stable. I plan to file bugs against cargo fix for these 3 scenarios.

The final commit explicitly uses things in preference to using absolute paths within functions. This commit isn't strictly required for a clean cargo fix run, but it will reduce unnecessary usage of the crate keyword one we run cargo fix for real.

jtgeibel and others added 4 commits July 25, 2018 00:39
These attributes were causing problems with an automated migration to
Rust 2018.
There are a few places where I left absolute paths because they
commonly conflict with variable names:

* `::json`
* `::krate`
@carols10cents
Copy link
Member

This is going to keep getting out of date and merge conflicty if we don't do it soon, and most of the other PRs already have merge conflicts sooooo

bors: r+

bors-voyager bot added a commit that referenced this pull request Aug 30, 2018
1467: Begin preparation for Rust 2018 r=carols10cents a=jtgeibel

This PR captures some of the results of my experimentation with `cargo fix`.  The first 2 commits are required in order to get `cargo fix` to apply cleanly.  In addition to these changes, there are 3 macros which cause problems in the automated conversion.  I have not incorporated the fix for these macros because the `crate` keyword cannot be used in paths on current stable.  I plan to file bugs against `cargo fix` for these 3 scenarios.

The final commit explicitly `use`s things in preference to using absolute paths within functions.  This commit isn't strictly required for a clean `cargo fix` run, but it will reduce unnecessary usage of the `crate` keyword one we run `cargo fix` for real.

Co-authored-by: Justin Geibel <jtgeibel@gmail.com>
Co-authored-by: Carol (Nichols || Goulding) <carol.nichols@gmail.com>
@bors-voyager
Copy link
Contributor

bors-voyager bot commented Aug 30, 2018

Build succeeded

@bors-voyager bors-voyager bot merged commit a2fbeb8 into rust-lang:master Aug 30, 2018
@jtgeibel jtgeibel deleted the rust-2018/stable-backports branch September 19, 2018 03:13
@jtgeibel jtgeibel restored the rust-2018/stable-backports branch September 19, 2018 03:14
@jtgeibel jtgeibel deleted the rust-2018/stable-backports branch September 19, 2018 03:15
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.

None yet

2 participants