mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #109682 - clubby789:c-str-inline, r=scottmcm

Browse Source 
Add `#[inline]` to CStr trait implementations

Fixes #109674

I noticed other usages of traits on `CStr` weren't being inlined, so also added hints to the other implementations
This commit is contained in:
Matthias Krüger 2023-03-28 07:01:11 +02:00 committed by GitHub
commit 90b6c715df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/core/src/ffi/c_str.rs
View File

@ -172,6 +172,7 @@ impl fmt::Debug for CStr {
#[stable(feature = "cstr_default", since = "1.10.0")] #[stable(feature = "cstr_default", since = "1.10.0")]
impl Default for &CStr { impl Default for &CStr {
#[inline]
fn default() -> Self { fn default() -> Self {
const SLICE: &[c_char] = &[0]; const SLICE: &[c_char] = &[0];
// SAFETY: `SLICE` is indeed pointing to a valid nul-terminated string. // SAFETY: `SLICE` is indeed pointing to a valid nul-terminated string.
@ -623,6 +624,7 @@ impl CStr {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl PartialEq for CStr { impl PartialEq for CStr {
#[inline]
fn eq(&self, other: &CStr) -> bool { fn eq(&self, other: &CStr) -> bool {
self.to_bytes().eq(other.to_bytes()) self.to_bytes().eq(other.to_bytes())
} }
@ -631,12 +633,14 @@ impl PartialEq for CStr {
impl Eq for CStr {} impl Eq for CStr {}
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl PartialOrd for CStr { impl PartialOrd for CStr {
#[inline]
fn partial_cmp(&self, other: &CStr) -> Option<Ordering> { fn partial_cmp(&self, other: &CStr) -> Option<Ordering> {
self.to_bytes().partial_cmp(&other.to_bytes()) self.to_bytes().partial_cmp(&other.to_bytes())
} }
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl Ord for CStr { impl Ord for CStr {
#[inline]
fn cmp(&self, other: &CStr) -> Ordering { fn cmp(&self, other: &CStr) -> Ordering {
self.to_bytes().cmp(&other.to_bytes()) self.to_bytes().cmp(&other.to_bytes())
} }
@ -646,6 +650,7 @@ impl Ord for CStr {
impl ops::Index<ops::RangeFrom<usize>> for CStr { impl ops::Index<ops::RangeFrom<usize>> for CStr {
type Output = CStr; type Output = CStr;
#[inline]
fn index(&self, index: ops::RangeFrom<usize>) -> &CStr { fn index(&self, index: ops::RangeFrom<usize>) -> &CStr {
let bytes = self.to_bytes_with_nul(); let bytes = self.to_bytes_with_nul();
// we need to manually check the starting index to account for the null // we need to manually check the starting index to account for the null