Miri and miri-related code contains repetitions of (n << amt) >> amt#56233
Merged
bors merged 2 commits intorust-lang:masterfrom Jan 26, 2019
Merged
Miri and miri-related code contains repetitions of (n << amt) >> amt#56233bors merged 2 commits intorust-lang:masterfrom
(n << amt) >> amt#56233bors merged 2 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
Contributor
|
rust-highfive
added
the
S-waiting-on-review
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Member
|
You have accidental submodule changes. Please use |
Member
|
r? @oli-obk |
Member
|
(Oh, you have multiple commits, you'll have to use |
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
Author
|
@eddyb Thank you for your advice. I updated submodules and pushed again. |
Member
|
@kenta7777 When I said |
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Dylan-DPC-zz
added
S-waiting-on-author
|
Pinging from triage @kenta7777 any updates on this? |
Member
|
r? @oli-obk |
Contributor
|
The implementation looks good to me. @kenta7777 can you do another rebase and remove the submodule changes from your second commit? You can |
Collaborator
|
☔ The latest upstream changes (presumably #56305) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
@oli-obk I apologize for the delay in replying to you. I'll revise my commits following your advice. |
kenta7777
force-pushed
the
kenta7777#49937
branch
from
712ed93 to
70e85ad
Compare
Contributor
|
@kenta7777 looks like you got some commits from another PR in here again. This time around a git fetch origin
git rebase -i origin/masterand removing all commits that are not yours should work |
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
Author
Contributor
|
Don't worry about it, everything is fixable with git! No need to open a new PR. Can you show me the output of |
Contributor
Author
|
This is an output of |
Contributor
|
Ok, great! So the following commands should get you back to business: Remember to remove any commits that are not yours from the list that shows up |
Contributor
Author
|
@oli-obk Thank you for your advice. I rebased following your advice. After that, This output is the first three commit log. But, This is the output of |
Contributor
|
You can now use |
kenta7777
force-pushed
the
kenta7777#49937
branch
from
36617d4 to
dcbd573
Compare
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
Author
|
Because of my some work, I'll work on this bug fix a few days later. |
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
Ping from triage @kenta7777 have you been able to make any progress on this? |
Contributor
Author
|
No. I'm considering fixing this error, but I can't find the way how to do. |
oli-obk
reviewed
Jan 15, 2019
src/librustc_lint/types.rs
Outdated
Contributor
There was a problem hiding this comment.
The issue is that sign_extend returns a u128 which contains the bits of a i128. It should suffice to cast the result to i128.
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
Author
|
@oli-obk Thank you for your review. I have fixed the issue. |
Contributor
|
The code looks perfect now. Please do another rebase (that should get rid of the merge commits). Just running |
Contributor
Author
|
@oli-obk I just ran |
kenta7777
force-pushed
the
kenta7777#49937
branch
from
3dfed67 to
b80332e
Compare
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit b80332e has been approved by |
bors
added
S-waiting-on-bors
Contributor
|
@bors rollup |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 25, 2019
Miri and miri-related code contains repetitions of `(n << amt) >> amt` I reduced some code repetitions contains `(n << amt) >> amt`. This pull request is related to rust-lang#49937.
bors
added a commit
that referenced
this pull request
Jan 25, 2019
Rollup of 5 pull requests Successful merges: - #56233 (Miri and miri-related code contains repetitions of `(n << amt) >> amt`) - #57645 (distinguish "no data" from "heterogeneous" in ABI) - #57734 (Fix evaluating trivial drop glue in constants) - #57886 (Add suggestion for moving type declaration before associated type bindings in generic arguments.) - #57890 (Fix wording in diagnostics page) Failed merges: r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I reduced some code repetitions contains
(n << amt) >> amt.This pull request is related to #49937.