From 0da69969d1fc8d375867ff07dfcefa2c4a2e7724 Mon Sep 17 00:00:00 2001 From: Ulrik Sverdrup Date: Sat, 4 Jul 2015 15:10:20 +0200 Subject: [PATCH] core: Use memcmp in is_prefix_of / is_suffix_of The basic str equality in core::str calls memcmp, re-use the same function in StrSearcher's is_prefix_of, is_suffix_of. --- src/libcore/str/pattern.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs index dccdaa9120d10..707f7fcf2abcf 100644 --- a/src/libcore/str/pattern.rs +++ b/src/libcore/str/pattern.rs @@ -513,17 +513,16 @@ impl<'a, 'b> Pattern<'a> for &'b str { /// Checks whether the pattern matches at the front of the haystack #[inline] fn is_prefix_of(self, haystack: &'a str) -> bool { - // Use `as_bytes` so that we can slice through a character in the haystack. - // Since self is always valid UTF-8, this can't result in a false positive. - self.len() <= haystack.len() && - self.as_bytes() == &haystack.as_bytes()[..self.len()] + haystack.is_char_boundary(self.len()) && + self == &haystack[..self.len()] } /// Checks whether the pattern matches at the back of the haystack #[inline] fn is_suffix_of(self, haystack: &'a str) -> bool { self.len() <= haystack.len() && - self.as_bytes() == &haystack.as_bytes()[haystack.len() - self.len()..] + haystack.is_char_boundary(haystack.len() - self.len()) && + self == &haystack[haystack.len() - self.len()..] } }