---

yaml
---
r: 103977
b: refs/heads/try
c: 086c0dd
h: refs/heads/master
i:
  103975: 08c1b16
v: v3

Author: lilyball

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
-refs/heads/try: 122c94d2f3909a06a5dd172b423b9b56a2f17039
+refs/heads/try: 086c0dd33febb752b036fba62dcfb8aa22a51642
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/vim/syntax/rust.vim

@@ -87,8 +87,7 @@ syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive
 syn keyword rustTrait GenericPath Path PosixPath WindowsPath
 syn keyword rustTrait RawPtr
 syn keyword rustTrait Buffer Writer Reader Seek
-syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr
-syn keyword rustTrait Str StrVector StrSlice OwnedStr
+syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned
 syn keyword rustTrait IterBytes
 syn keyword rustTrait ToStr IntoStr
 syn keyword rustTrait CloneableTuple ImmutableTuple

branches/try/src/libextra/test.rs

@@ -893,8 +893,8 @@ pub fn run_test(force_ignore: bool,
         spawn(proc() {
             let mut task = task::task();
             task.name(match desc.name {
-                DynTestName(ref name) => SendStrOwned(name.clone()),
-                StaticTestName(name) => SendStrStatic(name),
+                DynTestName(ref name) => name.to_owned().into_maybe_owned(),
+                StaticTestName(name) => name.into_maybe_owned()
             });
             let result_future = task.future_result();
             task.spawn(testfn);

branches/try/src/libgreen/lib.rs

@@ -257,7 +257,7 @@ pub fn run(main: proc()) -> int {
     let (port, chan) = Chan::new();
     let mut opts = TaskOpts::new();
     opts.notify_chan = Some(chan);
-    opts.name = Some(SendStrStatic("<main>"));
+    opts.name = Some("<main>".into_maybe_owned());
     pool.spawn(opts, main);
 
     // Wait for the main task to return, and set the process error code

branches/try/src/libgreen/task.rs

@@ -510,7 +510,7 @@ mod tests {
     #[test]
     fn smoke_opts() {
         let mut opts = TaskOpts::new();
-        opts.name = Some(SendStrStatic("test"));
+        opts.name = Some("test".into_maybe_owned());
         opts.stack_size = Some(20 * 4096);
         let (p, c) = Chan::new();
         opts.notify_chan = Some(c);

branches/try/src/libnative/task.rs

@@ -294,7 +294,7 @@ mod tests {
     #[test]
     fn smoke_opts() {
         let mut opts = TaskOpts::new();
-        opts.name = Some(SendStrStatic("test"));
+        opts.name = Some("test".into_maybe_owned());
         opts.stack_size = Some(20 * 4096);
         let (p, c) = Chan::new();
         opts.notify_chan = Some(c);

branches/try/src/libstd/lib.rs

@@ -117,7 +117,6 @@ pub mod vec_ng;
 pub mod str;
 
 pub mod ascii;
-pub mod send_str;
 
 pub mod ptr;
 pub mod owned;

branches/try/src/libstd/prelude.rs

@@ -63,8 +63,7 @@ pub use num::{Primitive, Int, Float, ToStrRadix, ToPrimitive, FromPrimitive};
 pub use path::{GenericPath, Path, PosixPath, WindowsPath};
 pub use ptr::RawPtr;
 pub use io::{Buffer, Writer, Reader, Seek};
-pub use send_str::{SendStr, SendStrOwned, SendStrStatic, IntoSendStr};
-pub use str::{Str, StrVector, StrSlice, OwnedStr};
+pub use str::{Str, StrVector, StrSlice, OwnedStr, IntoMaybeOwned};
 pub use to_bytes::IterBytes;
 pub use to_str::{ToStr, IntoStr};
 pub use tuple::{CloneableTuple, ImmutableTuple};

branches/try/src/libstd/rt/task.rs

@@ -30,7 +30,7 @@ use rt::local::Local;
 use rt::local_heap::LocalHeap;
 use rt::rtio::LocalIo;
 use rt::unwind::Unwinder;
-use send_str::SendStr;
+use str::SendStr;
 use sync::arc::UnsafeArc;
 use sync::atomics::{AtomicUint, SeqCst};
 use task::{TaskResult, TaskOpts};