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

First step towards u128 instead of Const in PatternKind::Range #51159

Merged
merged 1 commit into from
Sep 12, 2018
Merged

First step towards u128 instead of Const in PatternKind::Range #51159

merged 1 commit into from
Sep 12, 2018

Conversation

pacman82
Copy link
Contributor

This PR accomplishes two things:

  • It adds ty::Ty to PatternKind::Range. The extra type information will make it easier to remove it from the hi and lo members.
  • It exchanges Const for u128 in Constructor::ConstantRange.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cramertj (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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2018
@cramertj
Copy link
Member

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned cramertj May 29, 2018
@eddyb
Copy link
Member

eddyb commented May 30, 2018

cc @varkor

@pietroalbini
Copy link
Member

Ping from triage @oli-obk! This PR needs your review.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 4, 2018

cc @varkor is this conflicting with your changes in #50912 ?

@varkor
Copy link
Member

varkor commented Jun 4, 2018

@oli-obk: it does conflict, though it shouldn't be a huge pain to deal with. It would be less hassle for me if this PR could be merged after #50912, though.

@oli-obk oli-obk added the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label Jun 4, 2018
@TimNN TimNN removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2018
@pietroalbini pietroalbini added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jun 25, 2018
@bors
Copy link
Contributor

bors commented Jun 29, 2018

☔ The latest upstream changes (presumably #51884) made this pull request unmergeable. Please resolve the merge conflicts.

@TimNN
Copy link
Contributor

TimNN commented Aug 28, 2018

Ping from triage! Wow, after a multi-month process, the blocking PR has been merged 🎉

If I understand correctly, this PR should be unblocked now, however it does require a rebase, @pacman82.

@TimNN TimNN added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Aug 28, 2018
@pacman82
Copy link
Contributor Author

@TimNN Thanks for the ping; I'll hopefully find the time this weekend.

@pacman82
Copy link
Contributor Author

pacman82 commented Sep 4, 2018

@TimNN, @oli-obk Merged the changes from master

oli-obk
oli-obk requested changes Sep 4, 2018
View reviewed changes
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

just a nit.

Would you also be so kind and squash the commits into a single one?

src/librustc_mir/hair/pattern/_match.rs Outdated Show resolved Hide resolved
@BatmanAoD
Copy link
Member

Ping from triage, @pacman82; looks like this is pretty close.

@oli-obk
Copy link
Contributor

oli-obk commented Sep 11, 2018

r=me with the nits addressed.

@eddyb
Copy link
Member

eddyb commented Sep 11, 2018

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Sep 11, 2018

📌 Commit 26c05b1 has been approved by oli-obk

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 11, 2018
@bors
Copy link
Contributor

bors commented Sep 12, 2018

⌛ Testing commit 26c05b1 with merge a2b991b...

bors added a commit that referenced this pull request Sep 12, 2018
@bors
Auto merge of #51159 - pacman82:master, r=oli-obk
a2b991b 
First step towards `u128` instead of `Const` in `PatternKind::Range`

This PR accomplishes two things:
* It adds `ty::Ty` to `PatternKind::Range`. The extra type information will make it easier to remove it from the `hi` and `lo` members.
* It exchanges `Const` for `u128` in `Constructor::ConstantRange`.
@bors
Copy link
Contributor

bors commented Sep 12, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing a2b991b to master...

@bors bors merged commit 26c05b1 into rust-lang:master Sep 12, 2018
@DaniPopes DaniPopes mentioned this pull request Nov 29, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk requested changes

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@pacman82 @rust-highfive @cramertj @eddyb @pietroalbini @oli-obk @varkor @bors @TimNN @BatmanAoD