Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't panic in ceil_char_boundary #112387

Merged
merged 3 commits into from
Aug 15, 2023
Merged

Don't panic in ceil_char_boundary #112387

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43453a8
Don't panic in ceil_char_boundary
clarfonthey Jun 7, 2023
d47371d
Fix test
clarfonthey Jun 8, 2023
2f75dd4
Fix typo.
m-ou-se Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions library/alloc/tests/str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,10 +2416,7 @@ fn ceil_char_boundary() {
check_many("🇯🇵", 0..=0, 0);
check_many("🇯🇵", 1..=4, 4);
check_many("🇯🇵", 5..=8, 8);
}

#[test]
#[should_panic]
fn ceil_char_boundary_above_len_panic() {
let _ = "x".ceil_char_boundary(2);
// above len
check_many("hello", 5..=10, 5);
}
7 changes: 3 additions & 4 deletions library/core/src/str/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,13 @@ impl str {

/// Finds the closest `x` not below `index` where `is_char_boundary(x)` is `true`.
///
/// If `x` is greater than the length of the string, this returns the length of the string.
m-ou-se marked this conversation as resolved.
Show resolved Hide resolved
///
/// This method is the natural complement to [`floor_char_boundary`]. See that method
/// for more details.
///
/// [`floor_char_boundary`]: str::floor_char_boundary
///
/// # Panics
///
/// Panics if `index > self.len()`.
///
/// # Examples
///
Expand All @@ -296,7 +295,7 @@ impl str {
#[inline]
pub fn ceil_char_boundary(&self, index: usize) -> usize {
if index > self.len() {
slice_error_fail(self, index, index)
self.len()
} else {
let upper_bound = Ord::min(index + 4, self.len());
self.as_bytes()[index..upper_bound]
Expand Down