diff --git a/src/task/block_on.rs b/src/task/block_on.rs index eec530c..2d49dca 100644 --- a/src/task/block_on.rs +++ b/src/task/block_on.rs @@ -6,8 +6,8 @@ use std::sync::Arc; use std::task::{RawWaker, RawWakerVTable}; use std::thread::{self, Thread}; -use super::local; use super::task; +use super::task_local; use super::worker; use crate::future::Future; use crate::task::{Context, Poll, Waker}; @@ -66,7 +66,7 @@ where }); // Wrap the future into one that drops task-local variables on exit. - let future = local::add_finalizer(future); + let future = task_local::add_finalizer(future); let future = async move { let res = future.await; diff --git a/src/task/mod.rs b/src/task/mod.rs index 66d8b67..1844cca 100644 --- a/src/task/mod.rs +++ b/src/task/mod.rs @@ -26,19 +26,19 @@ pub use std::task::{Context, Poll, Waker}; pub use block_on::block_on; pub use builder::Builder; -pub use local::{AccessError, LocalKey}; pub use pool::spawn; pub use sleep::sleep; pub use task::{JoinHandle, Task, TaskId}; +pub use task_local::{AccessError, LocalKey}; pub use worker::current; mod block_on; mod builder; -mod local; mod pool; mod sleep; mod sleepers; mod task; +mod task_local; mod worker; pub(crate) mod blocking; diff --git a/src/task/pool.rs b/src/task/pool.rs index e36aace..49fbfe4 100644 --- a/src/task/pool.rs +++ b/src/task/pool.rs @@ -5,9 +5,9 @@ use crossbeam_deque::{Injector, Stealer, Worker}; use kv_log_macro::trace; use lazy_static::lazy_static; -use super::local; use super::sleepers::Sleepers; use super::task; +use super::task_local; use super::worker; use super::{Builder, JoinHandle}; use crate::future::Future; @@ -67,7 +67,7 @@ impl Pool { }); // Wrap the future into one that drops task-local variables on exit. - let future = unsafe { local::add_finalizer(future) }; + let future = unsafe { task_local::add_finalizer(future) }; // Wrap the future into one that logs completion on exit. let future = async move { diff --git a/src/task/task.rs b/src/task/task.rs index c86e008..8a1adde 100644 --- a/src/task/task.rs +++ b/src/task/task.rs @@ -6,7 +6,7 @@ use std::pin::Pin; use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; use std::sync::Arc; -use super::local; +use super::task_local; use crate::future::Future; use crate::task::{Context, Poll}; @@ -138,7 +138,7 @@ pub(crate) type Runnable = async_task::Task; pub(crate) struct Metadata { pub task_id: TaskId, pub name: Option, - pub local_map: local::Map, + pub local_map: task_local::Map, } pub(crate) struct Tag { @@ -154,7 +154,7 @@ impl Tag { Task(Arc::new(Metadata { task_id, name: Some(name), - local_map: local::Map::new(), + local_map: task_local::Map::new(), })) }); @@ -174,7 +174,7 @@ impl Tag { let new = Some(Task(Arc::new(Metadata { task_id: TaskId::new(), name: None, - local_map: local::Map::new(), + local_map: task_local::Map::new(), }))); let new_raw = mem::transmute::, usize>(new); diff --git a/src/task/local.rs b/src/task/task_local.rs similarity index 100% rename from src/task/local.rs rename to src/task/task_local.rs