Merge #511

511: Migrate to Rust 2018 r=jeehoonkang a=taiki-e

This migrates all crates to Rust 2018.

The first commit contains the minimal changes needed for the migration. This was mainly done by `cargo fix --editon`.
The second commit migrates the code to be the Rust 2018 idiomatic style. This mainly based on suggestions from `rust_2018_idioms` lint.

Co-authored-by: Taiki Endo <[email protected]>

Cargo.toml

@@ -6,6 +6,7 @@ name = "crossbeam"
 # - Create "crossbeam-X.Y.Z" git tag
 version = "0.7.3"
 authors = ["The Crossbeam Project Developers"]
+edition = "2018"
 license = "MIT/Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/crossbeam-rs/crossbeam"
@@ -44,7 +45,7 @@ alloc = ["crossbeam-epoch/alloc", "crossbeam-queue/alloc"]
 nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly", "crossbeam-queue/nightly"]
 
 [dependencies]
-cfg-if = "0.1.2"
+cfg-if = "0.1.10"
 
 [dependencies.crossbeam-channel]
 version = "0.4"

README.md

@@ -90,12 +90,6 @@ Add this to your `Cargo.toml`:
 crossbeam = "0.7"
 ```
 
-Next, add this to your crate:
-
-```rust
-extern crate crossbeam;
-```
-
 ## Compatibility
 
 Crossbeam supports stable Rust releases going back at least six months,

crossbeam-channel/Cargo.toml

@@ -6,6 +6,7 @@ name = "crossbeam-channel"
 # - Create "crossbeam-channel-X.Y.Z" git tag
 version = "0.4.2"
 authors = ["The Crossbeam Project Developers"]
+edition = "2018"
 license = "MIT/Apache-2.0 AND BSD-2-Clause"
 readme = "README.md"
 repository = "https://github.com/crossbeam-rs/crossbeam"
@@ -23,7 +24,7 @@ default = ["std"]
 std = ["crossbeam-utils/std"]
 
 [dependencies]
-cfg-if = "0.1.2"
+cfg-if = "0.1.10"
 
 [dependencies.crossbeam-utils]
 version = "0.7"

crossbeam-channel/README.md

@@ -44,13 +44,6 @@ Add this to your `Cargo.toml`:
 crossbeam-channel = "0.4"
 ```
 
-Next, add this to your crate:
-
-```rust
-#[macro_use]
-extern crate crossbeam_channel;
-```
-
 ## Compatibility
 
 Crossbeam Channel supports stable Rust releases going back at least six months,

crossbeam-channel/benches/crossbeam.rs

@@ -1,8 +1,5 @@
 #![feature(test)]
 
-extern crate crossbeam_channel;
-extern crate crossbeam_utils;
-extern crate num_cpus;
 extern crate test;
 
 use crossbeam_channel::{bounded, unbounded};

crossbeam-channel/benchmarks/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "benchmarks"
 version = "0.1.0"
+edition = "2018"
 publish = false
 
 [dependencies]

crossbeam-channel/benchmarks/atomicring.rs

@@ -1,6 +1,3 @@
-extern crate atomicring;
-extern crate crossbeam;
-
 use atomicring::AtomicRingBuffer;
 use std::thread;
 

crossbeam-channel/benchmarks/atomicringqueue.rs

@@ -1,6 +1,3 @@
-extern crate atomicring;
-extern crate crossbeam;
-
 use atomicring::AtomicRingQueue;
 use std::thread;
 

crossbeam-channel/benchmarks/bus.rs

@@ -1,6 +1,3 @@
-extern crate bus;
-extern crate crossbeam;
-
 use bus::Bus;
 
 mod message;

crossbeam-channel/benchmarks/chan.rs

@@ -1,6 +1,4 @@
-#[macro_use]
-extern crate chan;
-extern crate crossbeam;
+use chan::chan_select;
 
 mod message;
 
@@ -9,7 +7,7 @@ const THREADS: usize = 4;
 
 fn new<T>(cap: Option<usize>) -> (chan::Sender<T>, chan::Receiver<T>) {
     match cap {
-        None => chan::async(),
+        None => chan::r#async(),
         Some(cap) => chan::sync(cap),
     }
 }

crossbeam-channel/benchmarks/crossbeam-channel.rs

@@ -1,6 +1,3 @@
-extern crate crossbeam;
-extern crate crossbeam_channel;
-
 use crossbeam_channel::{bounded, unbounded, Receiver, Select, Sender};
 
 mod message;

crossbeam-channel/benchmarks/crossbeam-deque.rs

@@ -1,7 +1,4 @@
-extern crate crossbeam;
-extern crate crossbeam_deque as deque;
-
-use deque::{Steal, Worker};
+use crossbeam_deque::{Steal, Worker};
 use std::thread;
 
 mod message;

crossbeam-channel/benchmarks/flume.rs

@@ -1,5 +1,3 @@
-extern crate crossbeam;
-
 mod message;
 
 const MESSAGES: usize = 5_000_000;

crossbeam-channel/benchmarks/futures-channel.rs

@@ -1,6 +1,3 @@
-extern crate crossbeam;
-extern crate futures;
-
 use futures::channel::mpsc;
 use futures::executor::ThreadPool;
 use futures::prelude::*;

crossbeam-channel/benchmarks/lockfree.rs

@@ -1,6 +1,3 @@
-extern crate crossbeam;
-extern crate lockfree;
-
 use lockfree::channel;
 
 mod message;

crossbeam-channel/benchmarks/message.rs

@@ -6,7 +6,7 @@ const LEN: usize = 1;
 pub struct Message(pub [usize; LEN]);
 
 impl fmt::Debug for Message {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.pad("Message")
     }
 }

crossbeam-channel/benchmarks/mpmc.rs

@@ -1,6 +1,3 @@
-extern crate crossbeam;
-extern crate mpmc;
-
 use std::thread;
 
 mod message;

crossbeam-channel/benchmarks/mpsc.rs

@@ -1,5 +1,3 @@
-extern crate crossbeam;
-
 use std::sync::mpsc;
 
 mod message;

crossbeam-channel/benchmarks/segqueue.rs

@@ -1,5 +1,3 @@
-extern crate crossbeam;
-
 use crossbeam::queue::SegQueue;
 use std::thread;
 

crossbeam-channel/examples/fibonacci.rs

@@ -1,7 +1,5 @@
 //! An asynchronous fibonacci sequence generator.
 
-extern crate crossbeam_channel;
-
 use std::thread;
 
 use crossbeam_channel::{bounded, Sender};

crossbeam-channel/examples/matching.rs

@@ -42,11 +42,7 @@
 //! }
 //! ```
 
-#[macro_use]
-extern crate crossbeam_channel;
-extern crate crossbeam_utils;
-
-use crossbeam_channel::bounded;
+use crossbeam_channel::{bounded, select};
 use crossbeam_utils::thread;
 
 fn main() {

crossbeam-channel/examples/stopwatch.rs

@@ -1,14 +1,10 @@
 //! Prints the elapsed time every 1 second and quits on Ctrl+C.
 
-#[macro_use]
-extern crate crossbeam_channel;
-extern crate signal_hook;
-
 use std::io;
 use std::thread;
 use std::time::{Duration, Instant};
 
-use crossbeam_channel::{bounded, tick, Receiver};
+use crossbeam_channel::{bounded, select, tick, Receiver};
 use signal_hook::iterator::Signals;
 use signal_hook::SIGINT;
 

crossbeam-channel/src/channel.rs

@@ -7,11 +7,13 @@ use std::panic::{RefUnwindSafe, UnwindSafe};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
-use context::Context;
-use counter;
-use err::{RecvError, RecvTimeoutError, SendError, SendTimeoutError, TryRecvError, TrySendError};
-use flavors;
-use select::{Operation, SelectHandle, Token};
+use crate::context::Context;
+use crate::counter;
+use crate::err::{
+    RecvError, RecvTimeoutError, SendError, SendTimeoutError, TryRecvError, TrySendError,
+};
+use crate::flavors;
+use crate::select::{Operation, SelectHandle, Token};
 
 /// Creates a channel of unbounded capacity.
 ///
@@ -134,11 +136,9 @@ pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
 /// Using an `after` channel for timeouts:
 ///
 /// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
 /// # fn main() {
 /// use std::time::Duration;
-/// use crossbeam_channel::{after, unbounded};
+/// use crossbeam_channel::{after, select, unbounded};
 ///
 /// let (s, r) = unbounded::<i32>();
 /// let timeout = Duration::from_millis(100);
@@ -187,12 +187,10 @@ pub fn after(duration: Duration) -> Receiver<Instant> {
 /// Using a `never` channel to optionally add a timeout to [`select!`]:
 ///
 /// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
 /// # fn main() {
 /// use std::thread;
 /// use std::time::{Duration, Instant};
-/// use crossbeam_channel::{after, never, unbounded};
+/// use crossbeam_channel::{after, select, never, unbounded};
 ///
 /// let (s, r) = unbounded();
 ///
@@ -582,7 +580,7 @@ impl<T> Clone for Sender<T> {
 }
 
 impl<T> fmt::Debug for Sender<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.pad("Sender { .. }")
     }
 }
@@ -941,7 +939,7 @@ impl<T> Receiver<T> {
     ///
     /// assert_eq!(v, [1, 2, 3]);
     /// ```
-    pub fn iter(&self) -> Iter<T> {
+    pub fn iter(&self) -> Iter<'_, T> {
         Iter { receiver: self }
     }
 
@@ -977,7 +975,7 @@ impl<T> Receiver<T> {
     ///
     /// assert_eq!(v, [1, 2]);
     /// ```
-    pub fn try_iter(&self) -> TryIter<T> {
+    pub fn try_iter(&self) -> TryIter<'_, T> {
         TryIter { receiver: self }
     }
 
@@ -1040,7 +1038,7 @@ impl<T> Clone for Receiver<T> {
 }
 
 impl<T> fmt::Debug for Receiver<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.pad("Receiver { .. }")
     }
 }
@@ -1092,22 +1090,22 @@ impl<T> IntoIterator for Receiver<T> {
 ///
 /// assert_eq!(v, [1, 2, 3]);
 /// ```
-pub struct Iter<'a, T: 'a> {
+pub struct Iter<'a, T> {
     receiver: &'a Receiver<T>,
 }
 
-impl<'a, T> FusedIterator for Iter<'a, T> {}
+impl<T> FusedIterator for Iter<'_, T> {}
 
-impl<'a, T> Iterator for Iter<'a, T> {
+impl<T> Iterator for Iter<'_, T> {
     type Item = T;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.receiver.recv().ok()
     }
 }
 
-impl<'a, T> fmt::Debug for Iter<'a, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+impl<T> fmt::Debug for Iter<'_, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.pad("Iter { .. }")
     }
 }
@@ -1144,20 +1142,20 @@ impl<'a, T> fmt::Debug for Iter<'a, T> {
 ///
 /// assert_eq!(v, [1, 2]);
 /// ```
-pub struct TryIter<'a, T: 'a> {
+pub struct TryIter<'a, T> {
     receiver: &'a Receiver<T>,
 }
 
-impl<'a, T> Iterator for TryIter<'a, T> {
+impl<T> Iterator for TryIter<'_, T> {
     type Item = T;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.receiver.try_recv().ok()
     }
 }
 
-impl<'a, T> fmt::Debug for TryIter<'a, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+impl<T> fmt::Debug for TryIter<'_, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.pad("TryIter { .. }")
     }
 }
@@ -1206,7 +1204,7 @@ impl<T> Iterator for IntoIter<T> {
 }
 
 impl<T> fmt::Debug for IntoIter<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.pad("IntoIter { .. }")
     }
 }

crossbeam-channel/src/context.rs

@@ -8,7 +8,7 @@ use std::time::Instant;
 
 use crossbeam_utils::Backoff;
 
-use select::Selected;
+use crate::select::Selected;
 
 /// Thread-local context used in select.
 #[derive(Debug, Clone)]