From d82dd43387fef192714047ec0169ecd15f8b250a Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Sun, 14 Jun 2020 01:01:07 +0000 Subject: [PATCH] Group Pattern::strip_* method together --- src/libcore/str/pattern.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs index 263d6b5efdf..14f1f293d40 100644 --- a/src/libcore/str/pattern.rs +++ b/src/libcore/str/pattern.rs @@ -69,7 +69,7 @@ /// |--------------------------|-------------------------------------------| /// | `&str` | is substring | /// | `char` | is contained in string | -/// | `&[char] | any char in slice is contained in string | +/// | `&[char]` | any char in slice is contained in string | /// | `F: FnMut(char) -> bool` | `F` returns `true` for a char in string | /// | `&&str` | is substring | /// | `&String` | is substring | @@ -117,6 +117,15 @@ fn is_prefix_of(self, haystack: &'a str) -> bool { matches!(self.into_searcher(haystack).next(), SearchStep::Match(0, _)) } + /// Checks whether the pattern matches at the back of the haystack + #[inline] + fn is_suffix_of(self, haystack: &'a str) -> bool + where + Self::Searcher: ReverseSearcher<'a>, + { + matches!(self.into_searcher(haystack).next_back(), SearchStep::Match(_, j) if haystack.len() == j) + } + /// Removes the pattern from the front of haystack, if it matches. #[inline] fn strip_prefix_of(self, haystack: &'a str) -> Option<&'a str> { @@ -133,15 +142,6 @@ fn strip_prefix_of(self, haystack: &'a str) -> Option<&'a str> { } } - /// Checks whether the pattern matches at the back of the haystack - #[inline] - fn is_suffix_of(self, haystack: &'a str) -> bool - where - Self::Searcher: ReverseSearcher<'a>, - { - matches!(self.into_searcher(haystack).next_back(), SearchStep::Match(_, j) if haystack.len() == j) - } - /// Removes the pattern from the back of haystack, if it matches. #[inline] fn strip_suffix_of(self, haystack: &'a str) -> Option<&'a str> -- 2.44.0