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

Refactor IntErrorKind to avoid "underflow" terminology #77640

Merged
merged 10 commits into from
Nov 9, 2020
Merged

Refactor IntErrorKind to avoid "underflow" terminology #77640

merged 10 commits into from
Nov 9, 2020

Conversation

eopb
Copy link
Contributor

@eopb eopb commented Oct 7, 2020

This PR is a continuation of #76455

Changes

r? @KodrAus

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 7, 2020
@jonas-schievink jonas-schievink added relnotes Marks issues that should be documented in the release notes of the next release. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Oct 7, 2020
@eopb eopb mentioned this pull request Oct 11, 2020
Closed
KodrAus
KodrAus reviewed Oct 18, 2020
View reviewed changes
Copy link
Contributor

@KodrAus KodrAus left a comment

Choose a reason for hiding this comment

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

Thanks for working on this @ethanboxx! I've left a few little comments.

Since we're making some changes to the shape of the ParseIntError I think we should avoid stabilizing it just yet. Maybe give it a cycle or two with the new variants.

compiler/rustc_middle/src/middle/limits.rs Outdated Show resolved Hide resolved
library/core/src/num/error.rs Outdated Show resolved Hide resolved
library/core/src/num/error.rs Outdated Show resolved Hide resolved
library/core/src/num/error.rs Outdated Show resolved Hide resolved
library/core/src/num/error.rs Outdated Show resolved Hide resolved
eopb and others added 5 commits October 26, 2020 05:50
@eopb @KodrAus
Fix spelling eror
199c361 
Co-authored-by: Ashley Mannix <[email protected]>
@eopb @KodrAus
Small reword
69c301f 
Co-authored-by: Ashley Mannix <[email protected]>
@eopb @KodrAus
asci -> ASCII
75e6dee 
Co-authored-by: Ashley Mannix <[email protected]>
@eopb
Apply suggested changes
ad2d93d
@eopb
Fix typo
e750238
@eopb
Copy link
Contributor Author

eopb commented Oct 26, 2020

@KodrAus Thank you for your review. This should be ready now.

@KodrAus
Copy link
Contributor

KodrAus commented Nov 6, 2020

Thanks @ethanboxx! This looks good to me.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 6, 2020

📌 Commit e750238 has been approved by KodrAus

@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 Nov 6, 2020
@KodrAus KodrAus changed the title stabilize int_error_matching attempt 2 Refactor IntErrorKind to avoid "underflow" terminology Nov 6, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#77640 - ethanboxx:int_error_matching_attemp…
a4d5d39 
…t_2, r=KodrAus

Refactor IntErrorKind to avoid "underflow" terminology

This PR is a continuation of rust-lang#76455

# Changes

- `Overflow` renamed to `PosOverflow` and `Underflow` renamed to `NegOverflow` after discussion in rust-lang#76455
- Changed some of the parsing code to return `InvalidDigit` rather than `Empty` for strings "+" and "-". https://users.rust-lang.org/t/misleading-error-in-str-parse-for-int-types/49178
- Carry the problem `char` with the `InvalidDigit` variant.
- Necessary changes were made to the compiler as it depends on `int_error_matching`.
- Redid tests to match on specific errors.

r? `@KodrAus`
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Nov 8, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#77640 - ethanboxx:int_error_matching_attemp…
a2c2720 
…t_2, r=KodrAus

Refactor IntErrorKind to avoid "underflow" terminology

This PR is a continuation of rust-lang#76455

# Changes

- `Overflow` renamed to `PosOverflow` and `Underflow` renamed to `NegOverflow` after discussion in rust-lang#76455
- Changed some of the parsing code to return `InvalidDigit` rather than `Empty` for strings "+" and "-". https://users.rust-lang.org/t/misleading-error-in-str-parse-for-int-types/49178
- Carry the problem `char` with the `InvalidDigit` variant.
- Necessary changes were made to the compiler as it depends on `int_error_matching`.
- Redid tests to match on specific errors.

r? ``@KodrAus``
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Nov 8, 2020
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Nov 9, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 9, 2020
@bors
Auto merge of rust-lang#78889 - Dylan-DPC:rollup-6zjhahf, r=Dylan-DPC
fe8f026 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#77640 (Refactor IntErrorKind to avoid "underflow" terminology)
 - rust-lang#78026 (Define `fs::hard_link` to not follow symlinks.)
 - rust-lang#78114 (Recognize `private_intra_doc_links` as a lint)
 - rust-lang#78228 (Promote aarch64-unknown-linux-gnu to Tier 1)
 - rust-lang#78345 (Fix handling of item names for HIR)
 - rust-lang#78437 (BTreeMap: stop mistaking node for an orderly place)
 - rust-lang#78476 (fix some incorrect aliasing in the BTree)
 - rust-lang#78674 (inliner: Use substs_for_mir_body)
 - rust-lang#78748 (Implement destructuring assignment for tuples)
 - rust-lang#78868 (Fix tab focus on restyled switches)
 - rust-lang#78878 (Avoid overlapping cfg attributes when both macOS and aarch64)
 - rust-lang#78882 (Nicer hunk headers for rust files)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d69ee57 into rust-lang:master Nov 9, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 9, 2020
@eopb eopb deleted the int_error_matching_attempt_2 branch December 7, 2020 12:03
@kennytm kennytm mentioned this pull request May 4, 2021
Closed
@eopb eopb mentioned this pull request May 4, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 22, 2021
@bors
Auto merge of rust-lang#84910 - eopb:stabilize_int_error_matching, r=…
75ed342 
…yaahc

stabilize `int_error_matching`

closes rust-lang#22639

> It has been over half a year since rust-lang#77640 (review), and the indexing question is rejected in rust-lang#79728 (review), so I guess we can submit another stabilization attempt? 😉

_Originally posted by `@kennytm` in rust-lang#22639 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KodrAus KodrAus KodrAus left review comments

Assignees

@KodrAus KodrAus

Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.
6 participants
@eopb @KodrAus @bors @jonas-schievink @rust-highfive @rustbot