diff options
| author | bors <bors@rust-lang.org> | 2020-03-31 14:00:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-31 14:00:55 +0000 |
| commit | 75ff3110ac6d8a0259023b83fd20d7ab295f8dd6 (patch) | |
| tree | 16273bf92f9580d0c1a3fbb99b10d32c234902b7 /src/liballoc | |
| parent | 2113659479a82ea69633b23ef710b58ab127755e (diff) | |
| parent | 976f8d59dddac2ccddbe940953ee6247454e6736 (diff) | |
| download | rust-75ff3110ac6d8a0259023b83fd20d7ab295f8dd6.tar.gz rust-75ff3110ac6d8a0259023b83fd20d7ab295f8dd6.zip | |
Auto merge of #70617 - Centril:rollup-063ycso, r=Centril
Rollup of 9 pull requests
Successful merges:
- #69784 (Optimize strip_prefix and strip_suffix with str patterns)
- #70548 (Add long error code for error E0226)
- #70555 (resolve, `try_resolve_as_non_binding`: use `delay_span_bug` due to parser recovery)
- #70561 (remove obsolete comment)
- #70562 (infer array len from pattern)
- #70585 (std: Fix over-aligned allocations on wasm32-wasi)
- #70587 (Add `Rust` to the code snippet)
- #70588 (Fix incorrect documentation for `str::{split_at, split_at_mut}`)
- #70613 (more clippy fixes)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/string.rs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 7c89d38caa4..1e5fe125c55 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -1849,6 +1849,21 @@ impl<'a, 'b> Pattern<'a> for &'b String { fn is_prefix_of(self, haystack: &'a str) -> bool { self[..].is_prefix_of(haystack) } + + #[inline] + fn strip_prefix_of(self, haystack: &'a str) -> Option<&'a str> { + self[..].strip_prefix_of(haystack) + } + + #[inline] + fn is_suffix_of(self, haystack: &'a str) -> bool { + self[..].is_suffix_of(haystack) + } + + #[inline] + fn strip_suffix_of(self, haystack: &'a str) -> Option<&'a str> { + self[..].strip_suffix_of(haystack) + } } #[stable(feature = "rust1", since = "1.0.0")] |
