Rename local.rs -> task_local.rs

This commit is contained in:
Stjepan Glavina 2019-09-18 13:59:22 +02:00
parent 4b32749886
commit bfd7af8775
5 changed files with 10 additions and 10 deletions

View file

@ -6,8 +6,8 @@ use std::sync::Arc;
use std::task::{RawWaker, RawWakerVTable}; use std::task::{RawWaker, RawWakerVTable};
use std::thread::{self, Thread}; use std::thread::{self, Thread};
use super::local;
use super::task; use super::task;
use super::task_local;
use super::worker; use super::worker;
use crate::future::Future; use crate::future::Future;
use crate::task::{Context, Poll, Waker}; use crate::task::{Context, Poll, Waker};
@ -66,7 +66,7 @@ where
}); });
// Wrap the future into one that drops task-local variables on exit. // 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 future = async move {
let res = future.await; let res = future.await;

View file

@ -26,19 +26,19 @@ pub use std::task::{Context, Poll, Waker};
pub use block_on::block_on; pub use block_on::block_on;
pub use builder::Builder; pub use builder::Builder;
pub use local::{AccessError, LocalKey};
pub use pool::spawn; pub use pool::spawn;
pub use sleep::sleep; pub use sleep::sleep;
pub use task::{JoinHandle, Task, TaskId}; pub use task::{JoinHandle, Task, TaskId};
pub use task_local::{AccessError, LocalKey};
pub use worker::current; pub use worker::current;
mod block_on; mod block_on;
mod builder; mod builder;
mod local;
mod pool; mod pool;
mod sleep; mod sleep;
mod sleepers; mod sleepers;
mod task; mod task;
mod task_local;
mod worker; mod worker;
pub(crate) mod blocking; pub(crate) mod blocking;

View file

@ -5,9 +5,9 @@ use crossbeam_deque::{Injector, Stealer, Worker};
use kv_log_macro::trace; use kv_log_macro::trace;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use super::local;
use super::sleepers::Sleepers; use super::sleepers::Sleepers;
use super::task; use super::task;
use super::task_local;
use super::worker; use super::worker;
use super::{Builder, JoinHandle}; use super::{Builder, JoinHandle};
use crate::future::Future; use crate::future::Future;
@ -67,7 +67,7 @@ impl Pool {
}); });
// Wrap the future into one that drops task-local variables on exit. // 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. // Wrap the future into one that logs completion on exit.
let future = async move { let future = async move {

View file

@ -6,7 +6,7 @@ use std::pin::Pin;
use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
use std::sync::Arc; use std::sync::Arc;
use super::local; use super::task_local;
use crate::future::Future; use crate::future::Future;
use crate::task::{Context, Poll}; use crate::task::{Context, Poll};
@ -138,7 +138,7 @@ pub(crate) type Runnable = async_task::Task<Tag>;
pub(crate) struct Metadata { pub(crate) struct Metadata {
pub task_id: TaskId, pub task_id: TaskId,
pub name: Option<String>, pub name: Option<String>,
pub local_map: local::Map, pub local_map: task_local::Map,
} }
pub(crate) struct Tag { pub(crate) struct Tag {
@ -154,7 +154,7 @@ impl Tag {
Task(Arc::new(Metadata { Task(Arc::new(Metadata {
task_id, task_id,
name: Some(name), 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 { let new = Some(Task(Arc::new(Metadata {
task_id: TaskId::new(), task_id: TaskId::new(),
name: None, name: None,
local_map: local::Map::new(), local_map: task_local::Map::new(),
}))); })));
let new_raw = mem::transmute::<Option<Task>, usize>(new); let new_raw = mem::transmute::<Option<Task>, usize>(new);