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

Rust 2018 #712

Merged
merged 1 commit into from
Dec 18, 2019
Merged

Rust 2018 #712

merged 1 commit into from
Dec 18, 2019

Conversation

c410-f3r
Copy link
Contributor

@c410-f3r c410-f3r commented Dec 10, 2019

Converts code-base to Rust 2018 and bumps minimum version to 1.31.

Brought to you by rustfix

@cuviper
Copy link
Member

cuviper commented Dec 10, 2019

error[E0658]: imports can only refer to extern crate names passed with `--extern` on stable channel (see issue #53130)
  --> rayon-core/src/lib.rs:60:9
   |
45 | mod join;
   | --------- not an extern crate passed with `--extern`
...
60 | pub use join::{join, join_context};
   |         ^^^^
   |
note: this import refers to the module defined here
  --> rayon-core/src/lib.rs:45:1
   |
45 | mod join;
   | ^^^^^^^^^

Looks like 1.32 uniform paths -- you should probably use rustfix/cargo fix from 1.31.

We'll need to increase the minor versions of the crates for our minimum rust policy.
This will also unblock #707.

@c410-f3r
Copy link
Contributor Author

c410-f3r commented Dec 10, 2019

@cuviper Paths fixed

It is not possible to cargo test or cargo build --all with 1.31 partially because docopt requires 1.32.

Copy link
Member

@cuviper cuviper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

However, #711 showed that windows-gnu CI is broken right now. When that's fixed, I'll probably yield to landing this PR first, then I can fix up my own conflicts.


use docopt::Docopt;
use rayon;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know rustfix does this, but I think this use is not actually needed, as rayon should be in the crate prelude. There are a few cases of this, but I won't comment them all. Not a big deal, just something that could be cleaned up.

@cuviper
Copy link
Member

cuviper commented Dec 18, 2019

I cut back Windows CI with #714, so let's see how this goes...

bors r+

bors bot added a commit that referenced this pull request Dec 18, 2019
712: Rust 2018 r=cuviper a=c410-f3r

Converts code-base to Rust 2018 and bumps minimum version to 1.31.

Brought to you by `rustfix`

Co-authored-by: Caio <c410.f3r@gmail.com>
@bors
Copy link
Contributor

bors bot commented Dec 18, 2019

@bors bors bot merged commit 9d552c4 into rayon-rs:master Dec 18, 2019
@Tom1380
Copy link

Tom1380 commented Jan 21, 2022

Any plans to update to Rust 2021?

@cuviper
Copy link
Member

cuviper commented Jan 21, 2022

@Tom1380 no specific plans, but we try to support versions of Rust for at least a year:
https://github.com/rayon-rs/rfcs/blob/master/accepted/rfc0003-minimum-rustc.md

I'm not aware of any motivating factor to press for that update. Crates are interoperable across editions.

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.

3 participants