Skip to content

Commit

Permalink
Auto merge of #27192 - dotdash:inline_eq_slice, r=luqmana
Browse files Browse the repository at this point in the history
eq_slice_() used to be a common implementation for two function that
both called it, but of those only eq_slice() is left, so we can as well
directly inline the code.
  • Loading branch information
bors committed Jul 23, 2015
2 parents cb4f102 + 000e870 commit 8d91bbd
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions src/libcore/str/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -871,12 +871,12 @@ impl<'a> DoubleEndedIterator for LinesAny<'a> {
Section: Comparing strings
*/

// share the implementation of the lang-item vs. non-lang-item
// eq_slice.
/// Bytewise slice equality
/// NOTE: This function is (ab)used in rustc::middle::trans::_match
/// to compare &[u8] byte slices that are not necessarily valid UTF-8.
#[lang = "str_eq"]
#[inline]
fn eq_slice_(a: &str, b: &str) -> bool {
fn eq_slice(a: &str, b: &str) -> bool {
// NOTE: In theory n should be libc::size_t and not usize, but libc is not available here
#[allow(improper_ctypes)]
extern { fn memcmp(s1: *const i8, s2: *const i8, n: usize) -> i32; }
Expand All @@ -887,15 +887,6 @@ fn eq_slice_(a: &str, b: &str) -> bool {
}
}

/// Bytewise slice equality
/// NOTE: This function is (ab)used in rustc::middle::trans::_match
/// to compare &[u8] byte slices that are not necessarily valid UTF-8.
#[lang = "str_eq"]
#[inline]
fn eq_slice(a: &str, b: &str) -> bool {
eq_slice_(a, b)
}

/*
Section: Misc
*/
Expand Down

0 comments on commit 8d91bbd

Please sign in to comment.