Skip to content

use a newtype for the variant discriminant in trans instead of u64 - #30931

Merged
bors merged 1 commit into
rust-lang:masterfrom
oli-obk:trans_disr_newtype
Jan 17, 2016
Merged

use a newtype for the variant discriminant in trans instead of u64#30931
bors merged 1 commit into
rust-lang:masterfrom
oli-obk:trans_disr_newtype

Conversation

@oli-obk

@oli-obk oli-obk commented Jan 15, 2016

Copy link
Copy Markdown
Contributor

This is groundwork for #30587 (typestrong constant integrals), but imo it's a change that in itself is good, too, since we don't just juggle u64s around anymore.

ty::Disr will be changed to a ConstInt in #30587

@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 @arielb1 (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.

@bors

bors commented Jan 15, 2016

Copy link
Copy Markdown
Collaborator

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

@oli-obk
oli-obk force-pushed the trans_disr_newtype branch from fd23740 to 109dfe7 Compare January 16, 2016 12:52
@oli-obk

oli-obk commented Jan 16, 2016

Copy link
Copy Markdown
Contributor Author

rebased

@pnkfelix

Copy link
Copy Markdown
Contributor

at least some of the travis failure error messages seems related to this PR?

@oli-obk
oli-obk force-pushed the trans_disr_newtype branch from 109dfe7 to 6fef118 Compare January 16, 2016 15:15
@oli-obk

oli-obk commented Jan 16, 2016

Copy link
Copy Markdown
Contributor Author

sorry about that. This time make check-stage1 ran through fine

@arielb1

arielb1 commented Jan 16, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 16, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 6fef118 has been approved by arielb1

@bors

bors commented Jan 17, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6fef118 with merge 0b524ed...

bors added a commit that referenced this pull request Jan 17, 2016
This is groundwork for #30587 (typestrong constant integrals), but imo it's a change that in itself is good, too, since we don't just juggle `u64`s around anymore.

`ty::Disr` will be changed to a `ConstInt` in #30587
@bors
bors merged commit 6fef118 into rust-lang:master Jan 17, 2016
oli-obk added a commit to oli-obk/rust that referenced this pull request Jan 18, 2016
it makes no sense here, accidentally introduced in rust-lang#30931
bors added a commit that referenced this pull request Jan 18, 2016
it makes no sense here, accidentally introduced in #30931

r? @dotdash
@oli-obk
oli-obk deleted the trans_disr_newtype branch June 15, 2020 15:25
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.

5 participants