git subtree pull && 2018 edition!

Merged as of rust commit e938c2b9aae7, just before hashbrown.

Author: cuviper

Cargo.toml

@@ -9,6 +9,7 @@ categories = ["concurrency", "data-structures"]
 description = "HashMap and HashSet with support for Rayon parallel iterators"
 license = "Apache-2.0/MIT"
 readme = "README.md"
+edition = "2018"
 
 [dependencies]
 rayon = "1.0"

src/intrinsics.rs

@@ -0,0 +1,4 @@
+#[inline(always)]
+pub unsafe fn unlikely(b: bool) -> bool {
+    b
+}

src/lib.rs

@@ -5,6 +5,8 @@ extern crate rayon;
 #[cfg(test)] extern crate rand;
 
 mod alloc;
+#[cfg(rayon_hash_unstable)]
+mod intrinsics;
 mod ptr;
 
 // #[stable(feature = "rust1", since = "1.0.0")]

src/par/map.rs

@@ -3,7 +3,7 @@ use rayon::iter::{FromParallelIterator, IntoParallelIterator, ParallelExtend, Pa
 use std::hash::{BuildHasher, Hash};
 
 use super::table;
-use HashMap;
+use crate::HashMap;
 
 pub use self::table::{ParIntoIter, ParIter, ParIterMut};
 pub use self::table::{ParKeys, ParValues, ParValuesMut};

src/par/set.rs

@@ -4,7 +4,7 @@ use rayon::iter::{FromParallelIterator, IntoParallelIterator, ParallelExtend, Pa
 use std::hash::{BuildHasher, Hash};
 
 use super::map;
-use HashSet;
+use crate::HashSet;
 
 pub struct ParIntoIter<T: Send> {
     inner: map::ParIntoIter<T, ()>,

src/par/table.rs

@@ -5,7 +5,7 @@ use std::ptr;
 use rayon::iter::plumbing::*;
 use rayon::prelude::*;
 
-use std_hash::table::{RawBucket, RawTable};
+use crate::std_hash::table::{RawBucket, RawTable};
 
 struct SplitBuckets<'a, K, V> {
     bucket: RawBucket<K, V>,