Deduplicating crate dependencies (part 1 of n)

ethcore/machine/Cargo.toml

@@ -15,7 +15,7 @@ required-features = ["test-helpers"]
 account-state = { path = "../account-state" }
 client-traits = { path = "../client-traits" }
 common-types = { path = "../types" }
-crossbeam-utils = "0.6"
+crossbeam-utils = "0.7.2"
 ethabi = "9.0.1"
 ethabi-contract = "9.0.0"
 ethabi-derive = "9.0.1"

ethcore/snapshot/Cargo.toml

@@ -18,7 +18,7 @@ bloom-journal = { package = "ethcore-bloom-journal", path = "../../util/bloom" }
 bytes = { package = "parity-bytes", version = "0.1.0" }
 client-traits = { path = "../client-traits" }
 common-types = { path = "../types" }
-crossbeam-utils = "0.6"
+crossbeam-utils = "0.7.2"
 engine = { path = "../engine" }
 ethcore-db = { path = "../db" }
 ethcore-io = { path = "../../util/io" }

parity/logger/Cargo.toml

@@ -13,5 +13,5 @@ lazy_static = "1.0"
 regex = "1.0"
 time = "0.1"
 parking_lot = "0.10.0"
-arrayvec = "0.4"
+arrayvec = "0.5.1"
 ansi_term = "0.11"

util/dir/Cargo.toml

@@ -8,4 +8,4 @@ license = "GPL3"
 ethereum-types = "0.8.0"
 journaldb = { path = "../journaldb" }
 app_dirs = { git = "https://github.com/paritytech/app-dirs-rs" }
-home = "0.3"
+home = "0.5.3"

util/io/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 [dependencies]
 fnv = "1.0"
 mio = { version = "0.6.19", optional = true }
-crossbeam-deque = "0.6"
+crossbeam-deque = "0.7.3"
 parking_lot = "0.10.0"
 log = "0.4"
 slab = "0.4"

util/io/src/service_mio.rs

@@ -199,7 +199,8 @@ impl<Message> IoManager<Message> where Message: Send + Sync + 'static {
 		event_loop: &mut EventLoop<IoManager<Message>>,
 		handlers: Arc<RwLock<Slab<Arc<dyn IoHandler<Message>>>>>
 	) -> Result<(), IoError> {
-		let (worker, stealer) = deque::fifo();
+		let worker = deque::Worker::new_fifo();
+		let stealer = worker.stealer();
 		let num_workers = 4;
 		let work_ready_mutex =  Arc::new(Mutex::new(()));
 		let work_ready = Arc::new(Condvar::new());

util/io/src/service_non_mio.rs

@@ -227,7 +227,8 @@ impl<Message> Clone for WorkTask<Message> where Message: Send + Sized {
 impl<Message> IoService<Message> where Message: Send + Sync + 'static {
 	/// Starts IO event loop
 	pub fn start() -> Result<IoService<Message>, IoError> {
-		let (tx, rx) = deque::fifo();
+		let tx = deque::Worker::new_fifo();
+		let rx = tx.stealer();
 
 		let shared = Arc::new(Shared {
 			handlers: RwLock::new(Slab::with_capacity(MAX_HANDLERS)),
@@ -317,16 +318,16 @@ fn do_work<Message>(shared: &Arc<Shared<Message>>, rx: deque::Stealer<WorkTask<M
 		match rx.steal() {
 			deque::Steal::Retry => continue,
 			deque::Steal::Empty => thread::park(),
-			deque::Steal::Data(WorkTask::Shutdown) => break,
-			deque::Steal::Data(WorkTask::UserMessage(message)) => {
+			deque::Steal::Success(WorkTask::Shutdown) => break,
+			deque::Steal::Success(WorkTask::UserMessage(message)) => {
 				for id in 0 .. MAX_HANDLERS {
 					if let Some(handler) = shared.handlers.read().get(id) {
 						let ctxt = IoContext { handler: id, shared: shared.clone() };
 						handler.message(&ctxt, &message);
 					}
 				}
 			},
-			deque::Steal::Data(WorkTask::TimerTrigger { handler_id, token }) => {
+			deque::Steal::Success(WorkTask::TimerTrigger { handler_id, token }) => {
 				if let Some(handler) = shared.handlers.read().get(handler_id) {
 					let ctxt = IoContext { handler: handler_id, shared: shared.clone() };
 					handler.timeout(&ctxt, token);

util/io/src/worker.rs

@@ -90,7 +90,7 @@ impl Worker {
 
 					while !deleting.load(AtomicOrdering::Acquire) {
 						match stealer.steal() {
-							deque::Steal::Data(work) => Worker::do_work(work, channel.clone()),
+							deque::Steal::Success(work) => Worker::do_work(work, channel.clone()),
 							deque::Steal::Retry => {},
 							deque::Steal::Empty => break,
 						}