From decc83e9591322fc175f53901e6f0a219abf4d27 Mon Sep 17 00:00:00 2001
From: David Kellum <dek-oss@gravitext.com>
Date: Wed, 8 Aug 2018 08:57:25 -0700
Subject: [PATCH] Update to crossbeam-utils 0.5.0, fix imports (#519)

---
 tokio-threadpool/Cargo.toml          | 2 +-
 tokio-threadpool/src/pool/mod.rs     | 2 +-
 tokio-threadpool/src/task/queue.rs   | 2 +-
 tokio-threadpool/src/worker/entry.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tokio-threadpool/Cargo.toml b/tokio-threadpool/Cargo.toml
index afa4edad2..9f21f6ca4 100644
--- a/tokio-threadpool/Cargo.toml
+++ b/tokio-threadpool/Cargo.toml
@@ -20,7 +20,7 @@ categories = ["concurrency", "asynchronous"]
 tokio-executor = { version = "0.1.2", path = "../tokio-executor" }
 futures = "0.1.19"
 crossbeam-deque = "0.5.0"
-crossbeam-utils = "0.4.1"
+crossbeam-utils = "0.5.0"
 num_cpus = "1.2"
 rand = "0.5"
 log = "0.4"
diff --git a/tokio-threadpool/src/pool/mod.rs b/tokio-threadpool/src/pool/mod.rs
index 0c080b1c7..3364aa7cd 100644
--- a/tokio-threadpool/src/pool/mod.rs
+++ b/tokio-threadpool/src/pool/mod.rs
@@ -28,7 +28,7 @@ use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 use std::thread;
 
-use crossbeam_utils::cache_padded::CachePadded;
+use crossbeam_utils::CachePadded;
 use rand;
 
 #[derive(Debug)]
diff --git a/tokio-threadpool/src/task/queue.rs b/tokio-threadpool/src/task/queue.rs
index a50d7ada5..7782ac009 100644
--- a/tokio-threadpool/src/task/queue.rs
+++ b/tokio-threadpool/src/task/queue.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicPtr;
 use std::sync::atomic::Ordering::{Acquire, Release, AcqRel, Relaxed};
 
-use crossbeam_utils::cache_padded::CachePadded;
+use crossbeam_utils::CachePadded;
 
 #[derive(Debug)]
 pub(crate) struct Queue {
diff --git a/tokio-threadpool/src/worker/entry.rs b/tokio-threadpool/src/worker/entry.rs
index 8866b655d..4892342b5 100644
--- a/tokio-threadpool/src/worker/entry.rs
+++ b/tokio-threadpool/src/worker/entry.rs
@@ -8,7 +8,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::atomic::Ordering::{Acquire, AcqRel, Relaxed};
 
-use crossbeam_utils::cache_padded::CachePadded;
+use crossbeam_utils::CachePadded;
 use deque;
 
 // TODO: None of the fields should be public