diff options
| author | Björn Steinbrink <bsteinbr@gmail.com> | 2015-07-21 18:30:18 +0200 |
|---|---|---|
| committer | Björn Steinbrink <bsteinbr@gmail.com> | 2015-07-21 18:30:18 +0200 |
| commit | 000e870554dd15c827389ce352166f67d9c51323 (patch) | |
| tree | c77b013353b1d03917c18906a6584eaf5ef24473 /src/libcore | |
| parent | 90a36923e5ac3f167236ee99c8abe8122e3b067e (diff) | |
| download | rust-000e870554dd15c827389ce352166f67d9c51323.tar.gz rust-000e870554dd15c827389ce352166f67d9c51323.zip | |
Inline eq_slice_() into eq_slice()
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.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/str/mod.rs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 5269cce1744..4f0b881c5cd 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -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; } @@ -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 */ |
