Merge rayon-rs#712

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>

Author: bors[bot]

.travis.yml

@@ -9,10 +9,10 @@ matrix:
   fast_finish: true
   include:
     # NB: To help with CI delays, each `pull_request` is only tested on Linux,
-    # with 1.28 for compatibility and stable+rayon_unstable for broad test
+    # with 1.31 for compatibility and stable+rayon_unstable for broad test
     # coverage.  The bors bot counts as a `push` type, which will run it all.
 
-    - rust: 1.28.0
+    - rust: 1.31.0
       os: linux
       #if: everything!
       before_script: cp ci/compat-Cargo.lock ./Cargo.lock

Cargo.toml

@@ -5,6 +5,7 @@ version = "1.2.1"
 authors = ["Niko Matsakis <niko@alum.mit.edu>",
            "Josh Stone <cuviper@gmail.com>"]
 description = "Simple work-stealing parallelism for Rust"
+edition = "2018"
 license = "Apache-2.0/MIT"
 repository = "https://github.com/rayon-rs/rayon"
 documentation = "https://docs.rs/rayon/"

README.md

@@ -90,7 +90,7 @@ just add:
 use rayon::prelude::*;
 ```
 
-Rayon currently requires `rustc 1.28.0` or greater.
+Rayon currently requires `rustc 1.31.0` or greater.
 
 ## Contribution
 

ci/alt-core/Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "alt-core"
 version = "0.0.0"
 authors = ["Josh Stone <cuviper@gmail.com>"]

ci/highlander/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 authors = ["Josh Stone <cuviper@gmail.com>"]
+edition = "2018"
 name = "highlander"
 description = "There Can Be Only One"
 version = "0.0.0"

examples/cpu_monitor.rs

@@ -1,10 +1,8 @@
-extern crate docopt;
-extern crate rayon;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde;
 
 use docopt::Docopt;
+use rayon;
 use std::io;
 use std::process;
 

rayon-core/Cargo.toml

@@ -7,6 +7,7 @@ description = "Core APIs for Rayon"
 license = "Apache-2.0/MIT"
 repository = "https://github.com/rayon-rs/rayon"
 documentation = "https://docs.rs/rayon/"
+edition = "2018"
 links = "rayon-core"
 build = "build.rs"
 readme = "README.md"

rayon-core/README.md

@@ -8,4 +8,4 @@ Please see [Rayon Docs] for details about using Rayon.
 
 [Rayon Docs]: https://docs.rs/rayon/
 
-Rayon-core currently requires `rustc 1.28.0` or greater.
+Rayon-core currently requires `rustc 1.31.0` or greater.

rayon-core/src/internal/task.rs

@@ -60,7 +60,7 @@ pub unsafe trait ScopeHandle<'scope>: 'scope {
     /// This takes ownership of the scope handle, meaning that once
     /// you invoke `panicked`, the scope is permitted to terminate
     /// (and, in particular, the Rust lifetime `'scope` may end).
-    fn panicked(self, err: Box<Any + Send>);
+    fn panicked(self, err: Box<dyn Any + Send>);
 
     /// Indicates that the sub-tasks of this scope that you have
     /// spawned concluded successfully.

rayon-core/src/internal/worker.rs

@@ -2,8 +2,8 @@
 //! worker thread. Intended for building abstractions atop the
 //! rayon-core thread pool, rather than direct use by end users.
 
-use latch::LatchProbe;
-use registry;
+use crate::latch::LatchProbe;
+use crate::registry;
 use std::fmt;
 
 /// Represents the active worker thread.
@@ -29,7 +29,7 @@ impl<'w> WorkerThread<'w> {
     where
         F: Fn() -> bool,
     {
-        struct DummyLatch<'a, F: 'a> {
+        struct DummyLatch<'a, F> {
             f: &'a F,
         }
 
@@ -44,7 +44,7 @@ impl<'w> WorkerThread<'w> {
 }
 
 impl<'w> fmt::Debug for WorkerThread<'w> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("WorkerThread")
             .field("pool", &self.thread.registry().id())
             .field("index", &self.thread.index())
@@ -58,7 +58,7 @@ impl<'w> fmt::Debug for WorkerThread<'w> {
 /// a Rayon worker thread, `None` is immediately returned.
 pub fn if_in_worker_thread<F, R>(if_true: F) -> Option<R>
 where
-    F: FnOnce(&WorkerThread) -> R,
+    F: FnOnce(&WorkerThread<'_>) -> R,
 {
     unsafe {
         let thread = registry::WorkerThread::current().as_ref()?;