diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-04-28 20:36:08 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 23:43:39 -0700 |
| commit | ab92ea526d455b402efbccc7160c8aec0237c88f (patch) | |
| tree | 92e748f3e3496a48ac68dd290a0a08aa342740a1 /src/librand | |
| parent | ef6daf9935da103f1b915a5c9904794da79b0b60 (diff) | |
| download | rust-ab92ea526d455b402efbccc7160c8aec0237c88f.tar.gz rust-ab92ea526d455b402efbccc7160c8aec0237c88f.zip | |
std: Modernize the local_data api
This commit brings the local_data api up to modern rust standards with a few key improvements: * The `pop` and `set` methods have been combined into one method, `replace` * The `get_mut` method has been removed. All interior mutability should be done through `RefCell`. * All functionality is now exposed as a method on the keys themselves. Instead of importing std::local_data, you now use "key.replace()" and "key.get()". * All closures have been removed in favor of RAII functionality. This means that get() and get_mut() no long require closures, but rather return Option<SmartPointer> where the smart pointer takes care of relinquishing the borrow and also implements the necessary Deref traits * The modify() function was removed to cut the local_data interface down to its bare essentials (similarly to how RefCell removed set/get). [breaking-change]
Diffstat (limited to 'src/librand')
| -rw-r--r-- | src/librand/lib.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/librand/lib.rs b/src/librand/lib.rs index d5a2c163a90..cb27f2f0ff8 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -79,7 +79,6 @@ println!("{:?}", tuple_ptr) use std::cast; use std::io::IoResult; use std::kinds::marker; -use std::local_data; use std::strbuf::StrBuf; pub use isaac::{IsaacRng, Isaac64Rng}; @@ -581,9 +580,6 @@ pub struct TaskRng { marker: marker::NoSend, } -// used to make space in TLS for a random number generator -local_data_key!(TASK_RNG_KEY: Box<TaskRngInner>) - /// Retrieve the lazily-initialized task-local random number /// generator, seeded by the system. Intended to be used in method /// chaining style, e.g. `task_rng().gen::<int>()`. @@ -596,7 +592,10 @@ local_data_key!(TASK_RNG_KEY: Box<TaskRngInner>) /// the same sequence always. If absolute consistency is required, /// explicitly select an RNG, e.g. `IsaacRng` or `Isaac64Rng`. pub fn task_rng() -> TaskRng { - local_data::get_mut(TASK_RNG_KEY, |rng| match rng { + // used to make space in TLS for a random number generator + local_data_key!(TASK_RNG_KEY: Box<TaskRngInner>) + + match TASK_RNG_KEY.get() { None => { let r = match StdRng::new() { Ok(r) => r, @@ -607,12 +606,15 @@ pub fn task_rng() -> TaskRng { TaskRngReseeder); let ptr = &mut *rng as *mut TaskRngInner; - local_data::set(TASK_RNG_KEY, rng); + TASK_RNG_KEY.replace(Some(rng)); TaskRng { rng: ptr, marker: marker::NoSend } } - Some(rng) => TaskRng { rng: &mut **rng, marker: marker::NoSend } - }) + Some(rng) => TaskRng { + rng: &**rng as *_ as *mut TaskRngInner, + marker: marker::NoSend + } + } } impl Rng for TaskRng { |
