diff options
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/task.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 4 |
2 files changed, 4 insertions, 4 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"); } diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 8f2df831196..be05bfceaac 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -71,7 +71,7 @@ use rt::backtrace; use rt::local::Local; use rt::task::Task; use str::Str; -use strbuf::StrBuf; +use string::String; use task::TaskResult; use uw = rt::libunwind; @@ -389,7 +389,7 @@ fn begin_unwind_inner(msg: Box<Any:Send>, { let msg_s = match msg.as_ref::<&'static str>() { Some(s) => *s, - None => match msg.as_ref::<StrBuf>() { + None => match msg.as_ref::<String>() { Some(s) => s.as_slice(), None => "Box<Any>", } |