Add an &str.to_managed method to allow creating non-constant @str values (for issue #3433).

1 files changed, 20 insertions, 0 deletions

diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 677a33d56c0..e2e7b15b1d7 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -1869,6 +1869,11 @@ pub pure fn escape_unicode(s: &str) -> ~str {
     move out
 }
 
+extern mod rustrt {
+    #[rust_stack]
+    pure fn upcall_str_new_shared(cstr: *libc::c_char, len: size_t) -> @str;
+}
+
 /// Unsafe operations
 pub mod raw {
 
@@ -2090,6 +2095,7 @@ pub trait StrSlice {
     pure fn trim_left() -> ~str;
     pure fn trim_right() -> ~str;
     pure fn to_unique() -> ~str;
+    pure fn to_managed() -> @str;
     pure fn char_at(i: uint) -> char;
 }
 
@@ -2214,6 +2220,14 @@ impl &str: StrSlice {
     pure fn to_unique() -> ~str { self.slice(0, self.len()) }
 
     #[inline]
+    pure fn to_managed() -> @str {
+        do str::as_buf(self) |p, _len| {
+            rustrt::upcall_str_new_shared(p as *libc::c_char,
+                                          self.len() as size_t)
+        }
+    }
+
+    #[inline]
     pure fn char_at(i: uint) -> char { char_at(self, i) }
 }
 
@@ -3190,4 +3204,10 @@ mod tests {
         assert escape_default(~"\U0001d4ea\r") == ~"\\U0001d4ea\\r";
     }
 
+    #[test]
+    fn test_to_managed() {
+        assert (~"abc").to_managed() == @"abc";
+        assert view("abcdef", 1, 5).to_managed() == @"bcde";
+    }
+
 }