Merge #416

416: Migration to 2018 edition. r=jswrenn a=orium



Co-authored-by: Diogo Sousa <diogogsousa@gmail.com>

Author: bors[bot]

Cargo.toml

@@ -13,6 +13,8 @@ keywords = ["iterator", "data-structure", "zip", "product", "group-by"]
 categories = ["algorithms", "rust-patterns"]
 exclude = ["/bors.toml"]
 
+edition = "2018"
+
 [package.metadata.release]
 no-dev-version = true
 

README.rst

@@ -27,8 +27,6 @@ How to use in your crate:
 
 .. code:: rust
 
-    #[macro_use] extern crate itertools;
-
     use itertools::Itertools;
 
 How to contribute

benches/bench1.rs

@@ -1,17 +1,15 @@
-extern crate criterion;
-#[macro_use] extern crate itertools;
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use itertools::Itertools;
 use itertools::free::cloned;
+use itertools::iproduct;
 
 use std::iter::repeat;
 use std::cmp;
 use std::ops::{Add, Range};
 
 mod extra;
 
-use extra::ZipSlices;
+use crate::extra::ZipSlices;
 
 fn slice_iter(c: &mut Criterion) {
     let xs: Vec<_> = repeat(1i32).take(20).collect();

benches/combinations_with_replacement.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate itertools;
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use itertools::Itertools;
 

benches/fold_specialization.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate itertools;
-
 use criterion::{criterion_group, criterion_main, Criterion};
 use itertools::Itertools;
 

benches/tree_fold1.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate itertools;
-
 use criterion::{criterion_group, criterion_main, Criterion};
 use itertools::{Itertools, cloned};
 

benches/tuple_combinations.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate itertools;
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use itertools::Itertools;
 

benches/tuples.rs

@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate itertools;
-
 use criterion::{criterion_group, criterion_main, Criterion};
 use itertools::Itertools;
 

examples/iris.rs

@@ -3,10 +3,6 @@
 /// and does some simple manipulations.
 ///
 /// Iterators and itertools functionality are used throughout.
-///
-///
-
-extern crate itertools;
 
 use itertools::Itertools;
 use std::collections::HashMap;

src/adaptors/mod.rs

@@ -12,7 +12,7 @@ use std::fmt;
 use std::mem::replace;
 use std::iter::{Fuse, Peekable, FromIterator};
 use std::marker::PhantomData;
-use size_hint;
+use crate::size_hint;
 
 /// An iterator adaptor that alternates elements from two iterators until both
 /// run out.