Skip to content

Commit bfd7af8

Browse files
author
Stjepan Glavina
committed
Rename local.rs -> task_local.rs
1 parent 4b32749 commit bfd7af8

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Diff for: src/task/block_on.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::sync::Arc;
66
use std::task::{RawWaker, RawWakerVTable};
77
use std::thread::{self, Thread};
88

9-
use super::local;
109
use super::task;
10+
use super::task_local;
1111
use super::worker;
1212
use crate::future::Future;
1313
use crate::task::{Context, Poll, Waker};
@@ -66,7 +66,7 @@ where
6666
});
6767

6868
// Wrap the future into one that drops task-local variables on exit.
69-
let future = local::add_finalizer(future);
69+
let future = task_local::add_finalizer(future);
7070

7171
let future = async move {
7272
let res = future.await;

Diff for: src/task/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ pub use std::task::{Context, Poll, Waker};
2626

2727
pub use block_on::block_on;
2828
pub use builder::Builder;
29-
pub use local::{AccessError, LocalKey};
3029
pub use pool::spawn;
3130
pub use sleep::sleep;
3231
pub use task::{JoinHandle, Task, TaskId};
32+
pub use task_local::{AccessError, LocalKey};
3333
pub use worker::current;
3434

3535
mod block_on;
3636
mod builder;
37-
mod local;
3837
mod pool;
3938
mod sleep;
4039
mod sleepers;
4140
mod task;
41+
mod task_local;
4242
mod worker;
4343

4444
pub(crate) mod blocking;

Diff for: src/task/pool.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use crossbeam_deque::{Injector, Stealer, Worker};
55
use kv_log_macro::trace;
66
use lazy_static::lazy_static;
77

8-
use super::local;
98
use super::sleepers::Sleepers;
109
use super::task;
10+
use super::task_local;
1111
use super::worker;
1212
use super::{Builder, JoinHandle};
1313
use crate::future::Future;
@@ -67,7 +67,7 @@ impl Pool {
6767
});
6868

6969
// Wrap the future into one that drops task-local variables on exit.
70-
let future = unsafe { local::add_finalizer(future) };
70+
let future = unsafe { task_local::add_finalizer(future) };
7171

7272
// Wrap the future into one that logs completion on exit.
7373
let future = async move {

Diff for: src/task/task.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::pin::Pin;
66
use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
77
use std::sync::Arc;
88

9-
use super::local;
9+
use super::task_local;
1010
use crate::future::Future;
1111
use crate::task::{Context, Poll};
1212

@@ -138,7 +138,7 @@ pub(crate) type Runnable = async_task::Task<Tag>;
138138
pub(crate) struct Metadata {
139139
pub task_id: TaskId,
140140
pub name: Option<String>,
141-
pub local_map: local::Map,
141+
pub local_map: task_local::Map,
142142
}
143143

144144
pub(crate) struct Tag {
@@ -154,7 +154,7 @@ impl Tag {
154154
Task(Arc::new(Metadata {
155155
task_id,
156156
name: Some(name),
157-
local_map: local::Map::new(),
157+
local_map: task_local::Map::new(),
158158
}))
159159
});
160160

@@ -174,7 +174,7 @@ impl Tag {
174174
let new = Some(Task(Arc::new(Metadata {
175175
task_id: TaskId::new(),
176176
name: None,
177-
local_map: local::Map::new(),
177+
local_map: task_local::Map::new(),
178178
})));
179179

180180
let new_raw = mem::transmute::<Option<Task>, usize>(new);
File renamed without changes.

0 commit comments

Comments
 (0)