Skip to content

Commit

Permalink
Cargo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
vertexclique committed Oct 24, 2019
1 parent 000d42e commit 8778921
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
6 changes: 3 additions & 3 deletions lightproc/examples/proc_panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<F, R>(future: F) -> RecoverableHandle<R>
Expand Down
5 changes: 2 additions & 3 deletions lightproc/src/lightproc.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
3 changes: 1 addition & 2 deletions lightproc/src/proc_handle.rs
Original file line number Diff line number Diff line change
@@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion lightproc/src/raw_proc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<F> = CatchUnwind<AssertUnwindSafe<F>>;
Expand Down

0 comments on commit 8778921

Please sign in to comment.