Skip to content

Remove redundant assertion near is_char_boundary #38144

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.

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

Merged
merged 1 commit into from
Dec 7, 2016

Conversation

clarfonthey
Copy link
Contributor

Follow-up from #38056. is_char_boundary already checks for idx <= len, so, an extra assertion is redundant.

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Collaborator

bors commented Dec 3, 2016

📌 Commit 4dd590a has been approved by alexcrichton

@@ -1129,8 +1129,6 @@ impl String {
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn insert(&mut self, idx: usize, ch: char) {
let len = self.len();
assert!(idx <= len);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's redundant but it also affects the panic the users sees. The one below is the same, the last one is truly redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My personal opinion is that in this case, if we wanted a more verbose user error, we should do something like slice_error_fail from libstd/str.rs. Otherwise, it's just an assertion that adds more checks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that sounds fair

@bors
Copy link
Collaborator

bors commented Dec 7, 2016

⌛ Testing commit 4dd590a with merge 02ea82d...

bors added a commit that referenced this pull request Dec 7, 2016
Remove redundant assertion near is_char_boundary

Follow-up from #38056. `is_char_boundary` already checks for `idx <= len`, so, an extra assertion is redundant.
@bors bors merged commit 4dd590a into rust-lang:master Dec 7, 2016
@clarfonthey clarfonthey deleted the redundant branch January 3, 2017 04:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants