diff options
| author | bors <bors@rust-lang.org> | 2014-11-16 11:27:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-16 11:27:35 +0000 |
| commit | 0c7a3d6c167c4656e8d35a1d428d142993e0aaab (patch) | |
| tree | bf70393828be01b5042bdc76031d0a9ec7cb4900 /src/libstd/task.rs | |
| parent | cb51567e1911452f3da4b924a91e5360f5efe67c (diff) | |
| parent | 892d4e28f4021ffa815649ec3a52f22f929b3708 (diff) | |
| download | rust-0c7a3d6c167c4656e8d35a1d428d142993e0aaab.tar.gz rust-0c7a3d6c167c4656e8d35a1d428d142993e0aaab.zip | |
auto merge of #18978 : jakub-/rust/roll-up, r=cmr
Diffstat (limited to 'src/libstd/task.rs')
| -rw-r--r-- | src/libstd/task.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/task.rs b/src/libstd/task.rs index f0bb8a0f4bc..c7e31dae3d4 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -105,9 +105,8 @@ use rt::local::Local; use rt::task; use rt::task::Task; use str::{Str, SendStr, IntoMaybeOwned}; -use string::String; +use string::{String, ToString}; use sync::Future; -use to_string::ToString; /// A means of spawning a task pub trait Spawner { |