diff options
| author | CrLF0710 <crlf0710@gmail.com> | 2019-04-10 00:46:28 +0800 |
|---|---|---|
| committer | CrLF0710 <crlf0710@gmail.com> | 2019-04-10 09:40:44 +0800 |
| commit | 6635fbed4ca8c65822f99e994735bd1877fb063e (patch) | |
| tree | b025f0af7d69a1aa1713e81fbece7dfad30c1b3a /src/libstd/sys/sgx | |
| parent | 3750348daff89741e3153e0e120aa70a45ff5b68 (diff) | |
| download | rust-6635fbed4ca8c65822f99e994735bd1877fb063e.tar.gz rust-6635fbed4ca8c65822f99e994735bd1877fb063e.zip | |
Eliminate `FnBox` usages from libstd.
Diffstat (limited to 'src/libstd/sys/sgx')
| -rw-r--r-- | src/libstd/sys/sgx/thread.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libstd/sys/sgx/thread.rs b/src/libstd/sys/sgx/thread.rs index 565a523ebe0..b9f42d4ad1c 100644 --- a/src/libstd/sys/sgx/thread.rs +++ b/src/libstd/sys/sgx/thread.rs @@ -1,5 +1,4 @@ #![cfg_attr(test, allow(dead_code))] // why is this necessary? -use crate::boxed::FnBox; use crate::ffi::CStr; use crate::io; use crate::time::Duration; @@ -13,17 +12,16 @@ pub const DEFAULT_MIN_STACK_SIZE: usize = 4096; mod task_queue { use crate::sync::{Mutex, MutexGuard, Once}; use crate::sync::mpsc; - use crate::boxed::FnBox; pub type JoinHandle = mpsc::Receiver<()>; pub(super) struct Task { - p: Box<dyn FnBox()>, + p: Box<dyn FnOnce()>, done: mpsc::Sender<()>, } impl Task { - pub(super) fn new(p: Box<dyn FnBox()>) -> (Task, JoinHandle) { + pub(super) fn new(p: Box<dyn FnOnce()>) -> (Task, JoinHandle) { let (done, recv) = mpsc::channel(); (Task { p, done }, recv) } @@ -51,7 +49,7 @@ mod task_queue { impl Thread { // unsafe: see thread::Builder::spawn_unchecked for safety requirements - pub unsafe fn new(_stack: usize, p: Box<dyn FnBox()>) + pub unsafe fn new(_stack: usize, p: Box<dyn FnOnce()>) -> io::Result<Thread> { let mut queue_lock = task_queue::lock(); |
