From 8778921e2d8d3b3c0120dea8fa6eb6fe6f1a426c Mon Sep 17 00:00:00 2001 From: Mahmut Bulut Date: Thu, 24 Oct 2019 14:30:48 +0200 Subject: [PATCH] Cargo fix --- lightproc/examples/proc_panic.rs | 6 +++--- lightproc/src/lightproc.rs | 5 ++--- lightproc/src/proc_handle.rs | 3 +-- lightproc/src/raw_proc.rs | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lightproc/examples/proc_panic.rs b/lightproc/examples/proc_panic.rs index 01a82e34..4142b890 100644 --- a/lightproc/examples/proc_panic.rs +++ b/lightproc/examples/proc_panic.rs @@ -3,12 +3,12 @@ use std::sync::Arc; use std::thread; use crossbeam::channel::{unbounded, Sender}; -use futures::{executor, FutureExt}; +use futures::executor; use lazy_static::lazy_static; use lightproc::prelude::*; -use lightproc::proc_ext::ProcFutureExt; + use lightproc::recoverable_handle::RecoverableHandle; -use std::panic::AssertUnwindSafe; + use std::sync::atomic::AtomicUsize; fn spawn_on_thread(future: F) -> RecoverableHandle diff --git a/lightproc/src/lightproc.rs b/lightproc/src/lightproc.rs index 4efc472f..b4a1113d 100644 --- a/lightproc/src/lightproc.rs +++ b/lightproc/src/lightproc.rs @@ -1,15 +1,14 @@ +use std::fmt; use std::future::Future; use std::marker::PhantomData; use std::mem; use std::ptr::NonNull; -use std::{fmt, thread}; -use crate::catch_unwind::CatchUnwind; use crate::proc_data::ProcData; use crate::proc_ext::ProcFutureExt; use crate::proc_handle::ProcHandle; use crate::proc_stack::*; -use crate::raw_proc::{ProcFuture, RawProc}; +use crate::raw_proc::RawProc; use crate::recoverable_handle::RecoverableHandle; use std::panic::AssertUnwindSafe; diff --git a/lightproc/src/proc_handle.rs b/lightproc/src/proc_handle.rs index 6124ae53..915ec72e 100644 --- a/lightproc/src/proc_handle.rs +++ b/lightproc/src/proc_handle.rs @@ -1,15 +1,14 @@ +use std::fmt; use std::future::Future; use std::marker::{PhantomData, Unpin}; use std::pin::Pin; use std::ptr::NonNull; use std::sync::atomic::Ordering; use std::task::{Context, Poll}; -use std::{fmt, mem}; use crate::proc_data::ProcData; use crate::proc_stack::*; use crate::state::*; -use std::any::Any; /// A handle that awaits the result of a task. /// diff --git a/lightproc/src/raw_proc.rs b/lightproc/src/raw_proc.rs index 96064a0f..1b54a1b3 100644 --- a/lightproc/src/raw_proc.rs +++ b/lightproc/src/raw_proc.rs @@ -15,7 +15,7 @@ use crate::proc_layout::TaskLayout; use crate::proc_stack::*; use crate::proc_vtable::ProcVTable; use crate::state::*; -use std::any::Any; + use std::panic::AssertUnwindSafe; pub type ProcFuture = CatchUnwind>;