about summary refs log tree commit diff
path: root/src/libstd/task.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-21 18:46:46 +0000
committerbors <bors@rust-lang.org>2014-07-21 18:46:46 +0000
commitdf68c6f3c35354662b39128d56d5dcc6deadf591 (patch)
treeb51edf6031173f896f136b8cd42c05729109d384 /src/libstd/task.rs
parent9cc39a054d485e46f7b8292cea690407932232ce (diff)
parent414862db3cb7ff75f8d2373466e547a0464d683d (diff)
downloadrust-df68c6f3c35354662b39128d56d5dcc6deadf591.tar.gz
rust-df68c6f3c35354662b39128d56d5dcc6deadf591.zip
auto merge of #15864 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/task.rs')
-rw-r--r--src/libstd/task.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/task.rs b/src/libstd/task.rs
index 4b8c15a0152..19ad81a0483 100644
--- a/src/libstd/task.rs
+++ b/src/libstd/task.rs
@@ -106,7 +106,7 @@ use rt::task::Task;
 use str::{Str, SendStr, IntoMaybeOwned};
 use string::String;
 use sync::Future;
-use to_str::ToString;
+use to_string::ToString;
 
 /// A means of spawning a task
 pub trait Spawner {