---

yaml
---
r: 38611
b: refs/heads/incoming
c: 07edf90
h: refs/heads/master
i:
  38609: 453965d
  38607: bc1d7a0
v: v3

Author: Dretch

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: e9caa3fe2e291b7f2cea624bfd0dc879e95fe382
+refs/heads/incoming: 07edf9036715bde27cc7bbc0feb3ee6e461130da
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/str.rs

@@ -1869,11 +1869,6 @@ 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 {
 
@@ -2221,10 +2216,10 @@ impl &str: StrSlice {
 
     #[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)
-        }
+        let v = at_vec::from_fn(self.len() + 1, |i| {
+            if i == self.len() { 0 } else { self[i] }
+        });
+        unsafe { ::cast::transmute(v) }
     }
 
     #[inline]