Remove unneeded extern crate statements

cuviper · cuviper · commit b98bb23f0595 · 2019-12-19T12:15:06.000-08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,6 +32,8 @@ docopt = "1"
 lazy_static = "1"
 rand = "0.7"
 rand_xorshift = "0.2"
-serde = "1"
-serde_derive = "1"
 doc-comment = "0.3"
+
+[dev-dependencies.serde]
+version = "1.0.85"
+features = ["derive"]
diff --git a/README.md b/README.md
@@ -74,12 +74,6 @@ as:
 rayon = "1.1"
 ```
 
-and then add the following to your `lib.rs`:
-
-```rust
-extern crate rayon;
-```
-
 To use the Parallel Iterator APIs, a number of traits have to be in
 scope. The easiest way to bring those things into scope is to use the
 [Rayon prelude](https://docs.rs/rayon/*/rayon/prelude/index.html).  In
diff --git a/ci/compat-Cargo.lock b/ci/compat-Cargo.lock
diff --git a/examples/cpu_monitor.rs b/examples/cpu_monitor.rs
@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate serde_derive;
-
 use docopt::Docopt;
 use std::io;
 use std::process;
@@ -25,7 +22,7 @@ Options:
     -d N, --depth N              Control how hard the dummy task works [default: 27]
 ";
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     arg_scenario: String,
     flag_depth: usize,
diff --git a/rayon-core/src/lib.rs b/rayon-core/src/lib.rs
@@ -32,10 +32,6 @@ use std::io;
 use std::marker::PhantomData;
 use std::str::FromStr;
 
-#[cfg(any(debug_assertions))]
-#[macro_use]
-extern crate lazy_static;
-
 #[macro_use]
 mod log;
 #[macro_use]
@@ -244,11 +240,9 @@ impl ThreadPoolBuilder {
     /// A scoped pool may be useful in combination with scoped thread-local variables.
     ///
     /// ```
-    /// #[macro_use]
-    /// extern crate scoped_tls;
     /// # use rayon_core as rayon;
     ///
-    /// scoped_thread_local!(static POOL_DATA: Vec<i32>);
+    /// scoped_tls::scoped_thread_local!(static POOL_DATA: Vec<i32>);
     ///
     /// fn main() -> Result<(), rayon::ThreadPoolBuildError> {
     ///     let pool_data = vec![1, 2, 3];
diff --git a/rayon-core/src/log.rs b/rayon-core/src/log.rs
@@ -90,7 +90,7 @@ pub(super) enum Event {
 }
 
 #[cfg(debug_assertions)]
-lazy_static! {
+lazy_static::lazy_static! {
     pub(super) static ref LOG_ENV: bool =
         env::var("RAYON_LOG").is_ok() || env::var("RAYON_RS_LOG").is_ok();
 }
diff --git a/rayon-core/tests/scoped_threadpool.rs b/rayon-core/tests/scoped_threadpool.rs
@@ -1,13 +1,10 @@
-#[macro_use]
-extern crate scoped_tls;
-
 use crossbeam_utils::thread;
 use rayon_core::ThreadPoolBuilder;
 
 #[derive(PartialEq, Eq, Debug)]
 struct Local(i32);
 
-scoped_thread_local!(static LOCAL: Local);
+scoped_tls::scoped_thread_local!(static LOCAL: Local);
 
 #[test]
 fn missing_scoped_tls() {
diff --git a/rayon-core/tests/stack_overflow_crash.rs b/rayon-core/tests/stack_overflow_crash.rs
@@ -1,6 +1,3 @@
-#[cfg(unix)]
-extern crate libc;
-
 use rayon_core::ThreadPoolBuilder;
 
 use std::env;
diff --git a/rayon-demo/Cargo.toml b/rayon-demo/Cargo.toml
@@ -16,10 +16,12 @@ odds = "0.3"
 rand = "0.7"
 rand_xorshift = "0.2"
 regex = "1"
-serde = "1"
-serde_derive = "1"
 time = "0.1"
 
+[dependencies.serde]
+version = "1.0.85"
+features = ["derive"]
+
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
 
diff --git a/rayon-demo/src/fibonacci/mod.rs b/rayon-demo/src/fibonacci/mod.rs
@@ -13,8 +13,6 @@
 //! unless you have a whole lot of CPUs.  The iterative version reveals the
 //! joke.
 
-extern crate test;
-
 const N: u32 = 32;
 const FN: u32 = 2_178_309;
 
diff --git a/rayon-demo/src/find/mod.rs b/rayon-demo/src/find/mod.rs
@@ -8,7 +8,7 @@ macro_rules! make_tests {
             use rayon::prelude::*;
             use test::Bencher;
 
-            lazy_static! {
+            lazy_static::lazy_static! {
                 static ref HAYSTACK: Vec<[u32; $n]> = {
                     let rng = crate::seeded_rng();
                     rng.sample_iter(&Standard)
diff --git a/rayon-demo/src/life/mod.rs b/rayon-demo/src/life/mod.rs
@@ -29,7 +29,7 @@ use rayon::prelude::*;
 #[cfg(test)]
 mod bench;
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
     cmd_play: bool,
diff --git a/rayon-demo/src/main.rs b/rayon-demo/src/main.rs
@@ -36,16 +36,8 @@ mod str_split;
 #[cfg(test)]
 mod vec_collect;
 
-#[macro_use]
-extern crate serde_derive; // all
-#[macro_use]
-extern crate glium; // nbody
-#[macro_use]
-extern crate lazy_static; // find
 #[cfg(test)]
 extern crate test;
-#[cfg(windows)]
-extern crate winapi; // life
 
 const USAGE: &str = "
 Usage: rayon-demo bench
diff --git a/rayon-demo/src/matmul/mod.rs b/rayon-demo/src/matmul/mod.rs
@@ -10,7 +10,7 @@ Options:
     -h, --help      Show this message.
 ";
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
     flag_size: usize,
diff --git a/rayon-demo/src/mergesort/mod.rs b/rayon-demo/src/mergesort/mod.rs
@@ -18,7 +18,7 @@ Options:
     -h, --help         Show this message.
 ";
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
     flag_size: usize,
diff --git a/rayon-demo/src/nbody/mod.rs b/rayon-demo/src/nbody/mod.rs
@@ -41,14 +41,14 @@ Ported from the RiverTrail demo found at:
     https://github.com/IntelLabs/RiverTrail/tree/master/examples/nbody-webgl
 ";
 
-#[derive(Copy, Clone, PartialEq, Eq, Deserialize)]
+#[derive(Copy, Clone, PartialEq, Eq, serde::Deserialize)]
 pub enum ExecutionMode {
     Par,
     ParReduce,
     Seq,
 }
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
     cmd_visualize: bool,
diff --git a/rayon-demo/src/nbody/visualize.rs b/rayon-demo/src/nbody/visualize.rs
@@ -16,7 +16,7 @@ struct Vertex {
     position: [f32; 3],
 }
 
-implement_vertex!(Vertex, position);
+glium::implement_vertex!(Vertex, position);
 
 fn icosahedron() -> ([Vertex; 12], Vec<u8>) {
     let phi = (1.0 + f32::sqrt(5.0)) / 2.0;
@@ -75,7 +75,7 @@ struct Instance {
     world_position: [f32; 3],
 }
 
-implement_vertex!(Instance, color, world_position);
+glium::implement_vertex!(Instance, color, world_position);
 
 pub fn visualize_benchmarks(num_bodies: usize, mut mode: ExecutionMode) {
     let mut events_loop = EventsLoop::new();
@@ -181,7 +181,7 @@ pub fn visualize_benchmarks(num_bodies: usize, mut mode: ExecutionMode) {
                 (&vertex_buffer, instance_buffer.per_instance().unwrap()),
                 &index_buffer,
                 &program,
-                &uniform! { matrix: view_proj },
+                &glium::uniform! { matrix: view_proj },
                 &params,
             )
             .unwrap();
diff --git a/rayon-demo/src/noop/mod.rs b/rayon-demo/src/noop/mod.rs
@@ -11,7 +11,7 @@ Options:
 use crate::cpu_time;
 use docopt::Docopt;
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     flag_sleep: u64,
     flag_iters: u64,
diff --git a/rayon-demo/src/quicksort/mod.rs b/rayon-demo/src/quicksort/mod.rs
@@ -15,7 +15,7 @@ Options:
     -h, --help         Show this message.
 ";
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
     flag_size: usize,
diff --git a/rayon-demo/src/sieve/mod.rs b/rayon-demo/src/sieve/mod.rs
@@ -31,7 +31,7 @@ Options:
     -h, --help         Show this message.
 ";
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
 }
diff --git a/rayon-demo/src/str_split.rs b/rayon-demo/src/str_split.rs
@@ -4,7 +4,7 @@ use rand::seq::SliceRandom;
 use rayon::prelude::*;
 use test::Bencher;
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref HAYSTACK: String = {
         let mut rng = crate::seeded_rng();
         let mut bytes: Vec<u8> = "abcdefg ".bytes().cycle().take(1_000_000).collect();
diff --git a/rayon-demo/src/tsp/mod.rs b/rayon-demo/src/tsp/mod.rs
@@ -42,7 +42,7 @@ Options:
     --from N           Node index from which to start the search [default: 0].
 ";
 
-#[derive(Deserialize)]
+#[derive(serde::Deserialize)]
 pub struct Args {
     cmd_bench: bool,
     arg_datafile: String,
diff --git a/rayon-demo/src/tsp/parser.rs b/rayon-demo/src/tsp/parser.rs
@@ -23,11 +23,11 @@ use super::weight::Weight;
 // NODE_COORD_SECTION
 // 1 11003.611100 42102.500000
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref HEADER: Regex = Regex::new(r"([A-Z_]+)\s*:(.*)").unwrap();
 }
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref COORD: Regex = Regex::new(r"([0-9]+) ([0-9.]+) ([0-9.]+)").unwrap();
 }
 
diff --git a/src/iter/mod.rs b/src/iter/mod.rs
@@ -403,9 +403,6 @@ pub trait ParallelIterator: Sized + Send {
     /// # Examples
     ///
     /// ```
-    /// extern crate rand;
-    /// extern crate rayon;
-    ///
     /// use rand::Rng;
     /// use rayon::prelude::*;
     ///
@@ -514,9 +511,6 @@ pub trait ParallelIterator: Sized + Send {
     /// # Examples
     ///
     /// ```
-    /// extern crate rand;
-    /// extern crate rayon;
-    ///
     /// use rand::Rng;
     /// use rayon::prelude::*;
     ///
@@ -636,9 +630,6 @@ pub trait ParallelIterator: Sized + Send {
     /// # Examples
     ///
     /// ```
-    /// extern crate rand;
-    /// extern crate rayon;
-    ///
     /// use rand::Rng;
     /// use rayon::prelude::*;
     ///
diff --git a/src/lib.rs b/src/lib.rs
@@ -39,8 +39,7 @@
 //!
 //! # Basic usage and the Rayon prelude
 //!
-//! First, you will need to add `rayon` to your `Cargo.toml` and put
-//! `extern crate rayon` in your main file (`lib.rs`, `main.rs`).
+//! First, you will need to add `rayon` to your `Cargo.toml`.
 //!
 //! Next, to use parallel iterators or the other high-level methods,
 //! you need to import several traits. Those traits are bundled into
@@ -84,11 +83,7 @@
 //! [faq]: https://github.com/rayon-rs/rayon/blob/master/FAQ.md
 
 #[cfg(test)]
-#[macro_use]
-extern crate doc_comment;
-
-#[cfg(test)]
-doctest!("../README.md");
+doc_comment::doctest!("../README.md");
 
 #[macro_use]
 mod delegate;
diff --git a/tests/sort-panic-safe.rs b/tests/sort-panic-safe.rs
@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate lazy_static;
-
 use rand::distributions::Uniform;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
@@ -13,7 +10,7 @@ use std::thread;
 
 static VERSIONS: AtomicUsize = AtomicUsize::new(0);
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref DROP_COUNTS: Vec<AtomicUsize> = (0..20_000).map(|_| AtomicUsize::new(0)).collect();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ pub(super) enum Event {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`#[cfg(debug_assertions)]`
`93`		`-lazy_static! {`
	`93`	`+lazy_static::lazy_static! {`
`94`	`94`	`pub(super) static ref LOG_ENV: bool =`
`95`	`95`	`env::var("RAYON_LOG").is_ok() \|\| env::var("RAYON_RS_LOG").is_ok();`
`96`	`96`	`}`