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.

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

Add a message for if an overflow occurs in core::intrinsics::is_nonoverlapping. #110388

Merged
merged 2 commits into from
Apr 17, 2023
Merged

Add a message for if an overflow occurs in core::intrinsics::is_nonoverlapping. #110388

merged 2 commits into from
Apr 17, 2023

Conversation

JohnBobbo96
Copy link
Contributor

No description provided.

and `unwrap` in `core::intrinsics`.
@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2023

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

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 16, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@JohnBobbo96 JohnBobbo96 changed the title Use a saturating_mul instead of a checked_mul Use a saturating_mul instead of a checked_mul and unwrap in core::intrinsics. Apr 16, 2023
@JohnBobbo96 JohnBobbo96 reopened this Apr 16, 2023
@scottmcm
Copy link
Member

Since this does something different, can you elaborate on why this is better? Is there a test that should be added?

@JohnBobbo96
Copy link
Contributor Author

I just kind of wanted to get rid of the unwrap, but i can close this if it is better to panic here (maybe add a panic message indicating overflow?), or i could also add some sort of test.

@JohnBobbo96
Copy link
Contributor Author

maybe something like this?

    let size = mem::size_of::<T>()
        .checked_mul(count)
        .expect("is_nonoverlapping: size_of::<T>() * count overflows a usize");

@the8472
Copy link
Member

the8472 commented Apr 16, 2023

is_nonoverlapping is only used in debug asserts, so making the error explicit (overflow is an error here) is fine.

`core::intrinsics::is_nonoverlapping`.
@JohnBobbo96 JohnBobbo96 changed the title Use a saturating_mul instead of a checked_mul and unwrap in core::intrinsics. Add a message for if an overflow occurs in core::intrinsics::is_nonoverlapping. Apr 16, 2023
@JohnBobbo96
Copy link
Contributor Author

I have changed it to be an explicit error message on overflow.

@the8472
Copy link
Member

the8472 commented Apr 16, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 16, 2023

📌 Commit 3dba587 has been approved by the8472

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 16, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#110038 (Erase regions when confirming transmutability candidate)
 - rust-lang#110341 (rustdoc: stop passing a title to `replaceState` second argument)
 - rust-lang#110388 (Add a message for if an overflow occurs in `core::intrinsics::is_nonoverlapping`.)
 - rust-lang#110404 (fix clippy::toplevel_ref_arg and ::manual_map)
 - rust-lang#110421 (Spelling librustdoc)
 - rust-lang#110423 (Spelling srcdoc)
 - rust-lang#110433 (Windows: map a few more error codes to ErrorKind)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6e9a52c into rust-lang:master Apr 17, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 17, 2023
@JohnBobbo96 JohnBobbo96 deleted the remove-intrinsic-unwrap branch April 22, 2023 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants