languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-07-21 10:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rollup merge of #41120 - clarcharr:c_str_transmute, r=alexcrichton

Browse source 
Remove some CStr transmutes.

Because dedicated methods exist for these, we don't have to add other transmutes.
This commit is contained in:
Corey Farwell 2017-04-07 09:20:09 -04:00 committed by GitHub
parent 2a92fe2aaa 9ffb54568c
commit 25518db1dc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstd/ffi/c_str.rs
View file

@ -356,7 +356,7 @@ impl ops::Deref for CString {
type Target = CStr;
fn deref(&self) -> &CStr {
unsafe { mem::transmute(self.as_bytes_with_nul()) }
unsafe { CStr::from_bytes_with_nul_unchecked(self.as_bytes_with_nul()) }
}
}
@ -583,7 +583,8 @@ impl CStr {
#[stable(feature = "rust1", since = "1.0.0")]
pub unsafe fn from_ptr<'a>(ptr: *const c_char) -> &'a CStr {
let len = libc::strlen(ptr);
mem::transmute(slice::from_raw_parts(ptr, len as usize + 1))
let ptr = ptr as *const u8;
CStr::from_bytes_with_nul_unchecked(slice::from_raw_parts(ptr, len as usize + 1))
}
/// Creates a C string wrapper from a byte slice.