diff options
| author | bors <bors@rust-lang.org> | 2014-05-24 21:51:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-24 21:51:18 -0700 |
| commit | 7d76d0ad44e1ec203d235f22eb3514247b8cbfe5 (patch) | |
| tree | 01682cf8147183250713acf5e8a77265aab7153c /src/libstd/rt/task.rs | |
| parent | bbb70cdd9cd982922cf7390459d53bde409699ae (diff) | |
| parent | 553074506ecd139eb961fb91eb33ad9fd0183acb (diff) | |
| download | rust-7d76d0ad44e1ec203d235f22eb3514247b8cbfe5.tar.gz rust-7d76d0ad44e1ec203d235f22eb3514247b8cbfe5.zip | |
auto merge of #14323 : richo/rust/features/strbuf_to_string, r=huonw
Converts `StrBuf` to `String` throughout rustc and the standard library. Tests all pass locally, but usual caveats about platforms that aren't OSX apply since I don't have a test environment handy. @alexcritchon mentioned that @pcwalton may have a patch incoming that should block this? closes #14312
Diffstat (limited to 'src/libstd/rt/task.rs')
| -rw-r--r-- | src/libstd/rt/task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 3e61f3ff236..cd59de8899a 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -420,10 +420,10 @@ mod test { #[test] fn tls() { - local_data_key!(key: @StrBuf) + local_data_key!(key: @String) key.replace(Some(@"data".to_strbuf())); assert_eq!(key.get().unwrap().as_slice(), "data"); - local_data_key!(key2: @StrBuf) + local_data_key!(key2: @String) key2.replace(Some(@"data".to_strbuf())); assert_eq!(key2.get().unwrap().as_slice(), "data"); } |