From 517298de484b2a9c88689e8313bed5fde80acd79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20L=C3=B6bel?= <loebel.marvin@gmail.com>
Date: Sat, 5 Oct 2013 21:23:24 +0200
Subject: [PATCH] Implemented `IntoSendStr` on `SendStr` to allow naming a task
 with a `SendStr` directly

---
 src/libstd/send_str.rs                       |  5 +++++
 src/libstd/task/mod.rs                       | 15 +++++++++++++++
 src/test/run-fail/fail-task-name-send-str.rs | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 src/test/run-fail/fail-task-name-send-str.rs

diff --git a/src/libstd/send_str.rs b/src/libstd/send_str.rs
index 075c1abd25c6..3ef99d48a034 100644
--- a/src/libstd/send_str.rs
+++ b/src/libstd/send_str.rs
@@ -64,6 +64,11 @@ impl IntoSendStr for &'static str {
     fn into_send_str(self) -> SendStr { SendStrStatic(self) }
 }
 
+impl IntoSendStr for SendStr {
+    #[inline]
+    fn into_send_str(self) -> SendStr { self }
+}
+
 /*
 Section: String trait impls.
 `SendStr` should behave like a normal string, so we don't derive.
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index 315b11cac084..8e5353341eac 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -974,6 +974,21 @@ fn test_static_named_task() {
     }
 }
 
+#[test]
+fn test_send_named_task() {
+    use rt::test::run_in_newsched_task;
+
+    do run_in_newsched_task {
+        let mut t = task();
+        t.name("ada lovelace".into_send_str());
+        do t.spawn {
+            do with_task_name |name| {
+                assert!(name.unwrap() == "ada lovelace");
+            }
+        }
+    }
+}
+
 #[test]
 fn test_run_basic() {
     let (po, ch) = stream::<()>();
diff --git a/src/test/run-fail/fail-task-name-send-str.rs b/src/test/run-fail/fail-task-name-send-str.rs
new file mode 100644
index 000000000000..e44f78094ff4
--- /dev/null
+++ b/src/test/run-fail/fail-task-name-send-str.rs
@@ -0,0 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// error-pattern:task 'send name' failed at 'test'
+
+fn main() {
+    let mut t = ::std::task::task();
+    t.name("send name".to_send_str());
+    do t.spawn {
+        fail2!("test");
+    }
+}