/// Converting a foreign C string into a Rust `String`
///
/// ```no_run
-/// # #![feature(libc,cstr_to_str)]
+/// # #![feature(libc)]
/// extern crate libc;
/// use std::ffi::CStr;
///
/// The only appropriate argument is a pointer obtained by calling
/// `into_ptr`. The length of the string will be recalculated
/// using the pointer.
- #[unstable(feature = "cstr_memory", reason = "recently added",
+ #[unstable(feature = "cstr_memory2", reason = "recently added",
issue = "27769")]
#[deprecated(since = "1.4.0", reason = "renamed to from_raw")]
pub unsafe fn from_ptr(ptr: *const libc::c_char) -> CString {
- CString::from_raw(ptr)
+ CString::from_raw(ptr as *mut _)
}
/// Retakes ownership of a CString that was transferred to C.
/// The only appropriate argument is a pointer obtained by calling
/// `into_raw`. The length of the string will be recalculated
/// using the pointer.
- #[unstable(feature = "cstr_memory", reason = "recently added",
- issue = "27769")]
- pub unsafe fn from_raw(ptr: *const libc::c_char) -> CString {
+ #[stable(feature = "cstr_memory", since = "1.4.0")]
+ pub unsafe fn from_raw(ptr: *mut libc::c_char) -> CString {
let len = libc::strlen(ptr) + 1; // Including the NUL byte
let slice = slice::from_raw_parts(ptr, len as usize);
CString { inner: mem::transmute(slice) }
/// this string.
///
/// Failure to call `from_raw` will lead to a memory leak.
- #[unstable(feature = "cstr_memory", reason = "recently added",
+ #[unstable(feature = "cstr_memory2", reason = "recently added",
issue = "27769")]
#[deprecated(since = "1.4.0", reason = "renamed to into_raw")]
pub fn into_ptr(self) -> *const libc::c_char {
- self.into_raw()
+ self.into_raw() as *const _
}
/// Transfers ownership of the string to a C caller.
/// this string.
///
/// Failure to call `from_ptr` will lead to a memory leak.
- #[unstable(feature = "cstr_memory", reason = "recently added",
- issue = "27769")]
- pub fn into_raw(self) -> *const libc::c_char {
- // It is important that the bytes be sized to fit - we need
- // the capacity to be determinable from the string length, and
- // shrinking to fit is the only way to be sure.
- Box::into_raw(self.inner) as *const libc::c_char
+ #[stable(feature = "cstr_memory", since = "1.4.0")]
+ pub fn into_raw(self) -> *mut libc::c_char {
+ Box::into_raw(self.inner) as *mut libc::c_char
}
/// Returns the contents of this `CString` as a slice of bytes.
/// > after a 0-cost cast, but it is planned to alter its definition in the
/// > future to perform the length calculation in addition to the UTF-8
/// > check whenever this method is called.
- #[unstable(feature = "cstr_to_str", reason = "recently added",
- issue = "27764")]
+ #[stable(feature = "cstr_to_str", since = "1.4.0")]
pub fn to_str(&self) -> Result<&str, str::Utf8Error> {
// NB: When CStr is changed to perform the length check in .to_bytes()
// instead of in from_ptr(), it may be worth considering if this should
/// > after a 0-cost cast, but it is planned to alter its definition in the
/// > future to perform the length calculation in addition to the UTF-8
/// > check whenever this method is called.
- #[unstable(feature = "cstr_to_str", reason = "recently added",
- issue = "27764")]
+ #[stable(feature = "cstr_to_str", since = "1.4.0")]
pub fn to_string_lossy(&self) -> Cow<str> {
String::from_utf8_lossy(self.to_bytes())
}