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/libstd/rt | |
| 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/libstd/rt')
| -rw-r--r-- | src/libstd/rt/task.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 5b29de5a8c1..68d8c446cf9 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -414,13 +414,12 @@ mod test { #[test] fn tls() { - use local_data; local_data_key!(key: @~str) - local_data::set(key, @"data".to_owned()); - assert!(*local_data::get(key, |k| k.map(|k| *k)).unwrap() == "data".to_owned()); + key.replace(Some(@"data".to_owned())); + assert_eq!(key.get().unwrap().as_slice(), "data"); local_data_key!(key2: @~str) - local_data::set(key2, @"data".to_owned()); - assert!(*local_data::get(key2, |k| k.map(|k| *k)).unwrap() == "data".to_owned()); + key2.replace(Some(@"data".to_owned())); + assert_eq!(key2.get().unwrap().as_slice(), "data"); } #[test] |
