diff options
| author | bors <bors@rust-lang.org> | 2013-10-05 13:11:54 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-05 13:11:54 -0700 |
| commit | 0c388be8d1988a966ef62c545b996b9da0f71e93 (patch) | |
| tree | 16f9b35567953a2fa86d56ffdec42ed8d493d9be /src/libstd/rt | |
| parent | 1506dac10faf4b48f3d3debb9b20f2f55352deca (diff) | |
| parent | 517298de484b2a9c88689e8313bed5fde80acd79 (diff) | |
| download | rust-0c388be8d1988a966ef62c545b996b9da0f71e93.tar.gz rust-0c388be8d1988a966ef62c545b996b9da0f71e93.zip | |
auto merge of #9731 : Kimundi/rust/SendStrTaskName, r=alexcrichton
This resolves a FIXME in `std::rt::task`.
Diffstat (limited to 'src/libstd/rt')
| -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 0068d103073..2d1b57cebf5 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -33,6 +33,7 @@ use rt::context::Context; use unstable::finally::Finally; use task::spawn::Taskgroup; use cell::Cell; +use send_str::SendStr; // The Task struct represents all state associated with a rust // task. There are at this point two primary "subtypes" of task, @@ -49,8 +50,7 @@ pub struct Task { taskgroup: Option<Taskgroup>, death: Death, destroyed: bool, - // FIXME(#6874/#7599) use StringRef to save on allocations - name: Option<~str>, + name: Option<SendStr>, coroutine: Option<Coroutine>, sched: Option<~Scheduler>, task_type: TaskType, |