Add an &str.to_managed method to allow creating non-constant @str values (for issue #3433).
This commit is contained in:
parent
9406f8101d
commit
e9caa3fe2e
@ -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;
|
||||
}
|
||||
|
||||
@ -2213,6 +2219,14 @@ impl &str: StrSlice {
|
||||
#[inline]
|
||||
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";
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user