diff options
| author | bors <bors@rust-lang.org> | 2020-08-07 04:51:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-07 04:51:04 +0000 |
| commit | 98922795f68e86b0bca5aea8cfc66499d58eba1a (patch) | |
| tree | 8f2ecbb08d6896518adb88e71d752bcda7b94473 | |
| parent | 63e34422bbaf4ae4ed5ae7309183185aa2aa13a4 (diff) | |
| parent | 427634b5037ba1c00b72b70b561ff20767ea97e2 (diff) | |
| download | rust-98922795f68e86b0bca5aea8cfc66499d58eba1a.tar.gz rust-98922795f68e86b0bca5aea8cfc66499d58eba1a.zip | |
Auto merge of #75121 - tmiasko:str-slicing, r=Mark-Simulacrum
Avoid `unwrap_or_else` in str indexing This provides a small reduction of generated LLVM IR, and leads to a simpler assembly code. Closes #68874.
| -rw-r--r-- | library/core/src/str/mod.rs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/library/core/src/str/mod.rs b/library/core/src/str/mod.rs index 9d7e38d0e18..eac4741cd26 100644 --- a/library/core/src/str/mod.rs +++ b/library/core/src/str/mod.rs @@ -1923,7 +1923,10 @@ mod traits { #[inline] fn index(self, slice: &str) -> &Self::Output { let (start, end) = (self.start, self.end); - self.get(slice).unwrap_or_else(|| super::slice_error_fail(slice, start, end)) + match self.get(slice) { + Some(s) => s, + None => super::slice_error_fail(slice, start, end), + } } #[inline] fn index_mut(self, slice: &mut str) -> &mut Self::Output { @@ -1995,7 +1998,10 @@ mod traits { #[inline] fn index(self, slice: &str) -> &Self::Output { let end = self.end; - self.get(slice).unwrap_or_else(|| super::slice_error_fail(slice, 0, end)) + match self.get(slice) { + Some(s) => s, + None => super::slice_error_fail(slice, 0, end), + } } #[inline] fn index_mut(self, slice: &mut str) -> &mut Self::Output { @@ -2068,7 +2074,10 @@ mod traits { #[inline] fn index(self, slice: &str) -> &Self::Output { let (start, end) = (self.start, slice.len()); - self.get(slice).unwrap_or_else(|| super::slice_error_fail(slice, start, end)) + match self.get(slice) { + Some(s) => s, + None => super::slice_error_fail(slice, start, end), + } } #[inline] fn index_mut(self, slice: &mut str) -> &mut Self::Output { |