Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
pacman82:master
Sep 12, 2018
Merged

First step towards u128 instead of Const in PatternKind::Range#51159
bors merged 1 commit into
rust-lang:masterfrom
pacman82:master

Conversation

@pacman82

Copy link
Copy Markdown
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
Copy Markdown
Contributor

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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2018
@cramertj

Copy link
Copy Markdown
Member

r? @oli-obk

@eddyb

Copy link
Copy Markdown
Contributor

cc @varkor

@emilyalbini

Copy link
Copy Markdown
Member

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

@oli-obk

Copy link
Copy Markdown
Contributor

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

@varkor

Copy link
Copy Markdown
Contributor

@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-obkoli-obk added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Jun 4, 2018
@TimNNTimNN removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2018
@emilyalbiniemilyalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 25, 2018
@bors

bors commented Jun 29, 2018

Copy link
Copy Markdown
Collaborator

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

@TimNN

Copy link
Copy Markdown
Contributor

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.

@TimNNTimNN 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: Blocked on something else such as an RFC or other implementation work. labels Aug 28, 2018
@pacman82

Copy link
Copy Markdown
ContributorAuthor

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

@pacman82

Copy link
Copy Markdown
ContributorAuthor

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

@oli-obkoli-obk left a comment

Copy link
Copy Markdown
Contributor

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?

Comment threadsrc/librustc_mir/hair/pattern/_match.rs Outdated
@BatmanAoD

Copy link
Copy Markdown
Contributor

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

@oli-obk

Copy link
Copy Markdown
Contributor

r=me with the nits addressed.

@eddyb

Copy link
Copy Markdown
Contributor

@bors r=oli-obk

@bors

bors commented Sep 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 26c05b1 has been approved by oli-obk

@borsbors 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

bors commented Sep 12, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 26c05b1 with merge a2b991b...

bors added a commit that referenced this pull request Sep 12, 2018
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

bors commented Sep 12, 2018

Copy link
Copy Markdown
Collaborator

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

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

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@pacman82@rust-highfive@cramertj@eddyb@emilyalbini@oli-obk@varkor@bors@TimNN@BatmanAoD