languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark smaller CStr and CString functions as #[inline]

Browse source
This commit is contained in:
Alexander Bulaev 2017-06-17 15:50:55 +03:00
parent ff9f2d2ae9
commit bcb5b13b85
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,6 +308,7 @@ pub unsafe fn from_raw(ptr: *mut c_char) -> CString {
/// let _ = CString::from_raw(ptr);
/// }
/// ```
#[inline]
#[stable(feature = "cstr_memory", since = "1.4.0")]
pub fn into_raw(self) -> *mut c_char {
Box::into_raw(self.into_inner()) as *mut c_char
@ -382,6 +383,7 @@ pub fn into_bytes_with_nul(self) -> Vec<u8> {
/// let bytes = c_string.as_bytes();
/// assert_eq!(bytes, &[b'f', b'o', b'o']);
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn as_bytes(&self) -> &[u8] {
&self.inner[..self.inner.len() - 1]
@ -401,6 +403,7 @@ pub fn as_bytes(&self) -> &[u8] {
/// let bytes = c_string.as_bytes_with_nul();
/// assert_eq!(bytes, &[b'f', b'o', b'o', b'\0']);
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn as_bytes_with_nul(&self) -> &[u8] {
&self.inner
@ -409,6 +412,7 @@ pub fn as_bytes_with_nul(&self) -> &[u8] {
/// Extracts a [`CStr`] slice containing the entire string.
///
/// [`CStr`]: struct.CStr.html
#[inline]
#[unstable(feature = "as_c_str", issue = "40380")]
pub fn as_c_str(&self) -> &CStr {
&*self
@ -449,6 +453,7 @@ fn drop(&mut self) {
impl ops::Deref for CString {
type Target = CStr;
#[inline]
fn deref(&self) -> &CStr {
unsafe { CStr::from_bytes_with_nul_unchecked(self.as_bytes_with_nul()) }
}
@ -463,6 +468,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
#[stable(feature = "cstring_into", since = "1.7.0")]
impl From<CString> for Vec<u8> {
#[inline]
fn from(s: CString) -> Vec<u8> {
s.into_bytes()
}
@ -498,6 +504,7 @@ fn default() -> CString {
#[stable(feature = "cstr_borrow", since = "1.3.0")]
impl Borrow<CStr> for CString {
#[inline]
fn borrow(&self) -> &CStr { self }
}
@ -511,6 +518,7 @@ fn from(s: &'a CStr) -> Box<CStr> {
#[stable(feature = "c_string_from_box", since = "1.18.0")]
impl From<Box<CStr>> for CString {
#[inline]
fn from(s: Box<CStr>) -> CString {
s.into_c_string()
}
@ -518,6 +526,7 @@ fn from(s: Box<CStr>) -> CString {
#[stable(feature = "box_from_c_string", since = "1.18.0")]
impl Into<Box<CStr>> for CString {
#[inline]
fn into(self) -> Box<CStr> {
self.into_boxed_c_str()
}
@ -730,6 +739,7 @@ pub fn from_bytes_with_nul(bytes: &[u8])
/// assert_eq!(cstr, &*cstring);
/// }
/// ```
#[inline]
#[stable(feature = "cstr_from_bytes", since = "1.10.0")]
pub unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
mem::transmute(bytes)
@ -772,6 +782,7 @@ pub unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
/// *ptr;
/// }
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn as_ptr(&self) -> *const c_char {
self.inner.as_ptr()
@ -789,6 +800,7 @@ pub fn as_ptr(&self) -> *const c_char {
/// > **Note**: This method is currently implemented as a 0-cost cast, but
/// > it is planned to alter its definition in the future to perform the
/// > length calculation whenever this method is called.
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn to_bytes(&self) -> &[u8] {
let bytes = self.to_bytes_with_nul();
@ -805,6 +817,7 @@ pub fn to_bytes(&self) -> &[u8] {
/// > length calculation whenever this method is called.
///
/// [`to_bytes`]: #method.to_bytes
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn to_bytes_with_nul(&self) -> &[u8] {
unsafe { mem::transmute(&self.inner) }
@ -908,6 +921,7 @@ fn index(&self, _index: ops::RangeFull) -> &CStr {
#[stable(feature = "cstring_asref", since = "1.7.0")]
impl AsRef<CStr> for CStr {
#[inline]
fn as_ref(&self) -> &CStr {
self
}
@ -915,6 +929,7 @@ fn as_ref(&self) -> &CStr {
#[stable(feature = "cstring_asref", since = "1.7.0")]
impl AsRef<CStr> for CString {
#[inline]
fn as_ref(&self) -> &CStr {
self
}