Attempted fix to issue #63551 #63906
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (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
added
the
S-waiting-on-review
|
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 |
|
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 |
|
Could you please remove the rustfmt commit? While it is ok to format the lines you are working with, fornatting the rest gives too much noise. |
|
@bors delegate=bjorn3 |
|
✌️ @bjorn3 can now approve this pull request |
|
@petrochenkov I am not part of the rust team. r? @eddyb (does that work?) |
(That's not too important, I know that you worked on |
Didn't know that. Is that written down somewhere as policy? |
Kixiron
added
A-codegen
|
@luigisHat Tests are not currently passing |
| @@ -546,7 +546,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { | |||
| ) -> Bx::Value { | |||
| let is_float = input_ty.is_floating_point(); | |||
| let is_signed = input_ty.is_signed(); | |||
| let is_unit = input_ty.is_unit(); | |||
| // No need for this anymore ISSUE:#63551 | |||
| let _is_unit = input_ty.is_unit(); | |||
There was a problem hiding this comment.
Please remove this line and the one above.
| }) | ||
| } else if is_float { | ||
| mir::BinOp::Eq | mir::BinOp::Le | mir::BinOp::Ge => { | ||
| if is_float { |
There was a problem hiding this comment.
Please remove the { on the line above and merge this line into the one above.
| @@ -600,10 +596,12 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { | |||
| base::bin_op_to_icmp_predicate(op.to_hir_binop(), is_signed), | |||
| lhs, rhs | |||
| ) | |||
| } | |||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
|
Please squash your comments after fixing the review comments above. See for example http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html for how to squash. |
|
Sorry Having trouble with git rebase I have a merge conflict with rvalue.rs and It's giving me a headache. |
|
@bjorn3 I tried to git squash it but I think I messed it up. When I finish with git rebase I keep getting thrown back a commit and am required to pull and henceforth get stuck pushing two commits at once ("Added two commits six days ago"). Help would be appreciated |
|
Maybe reset your branch back to master and perform you changes again. $ git fetch origin # get latest version of rust
$ git reset --hard origin/master # reset current branch back to latest version of rust (throws all changes away)
$ # perform changes and commit
$ git push --force # push your changes to your forkHope that helps. Over time you will probably get better at using git, but at first it can be hard. |
|
Ping from triage: |
TheOregonTrail
force-pushed
the
cmp_fix
branch
from
2b688a8 to
4b57287
Compare
|
@JohnCSimon @bjorn3 Sorry about the late action I've had problems with my computer and just got my self repairs done today. Thanks for being patient 👍 |
bors
added
the
S-waiting-on-review
|
@luigisHat It seems some tests changed their error order. Please bless them. ( |
|
I should have checked the PR ci run before |
|
@bjorn3 Do you know why it says Alex Crichton canceled the build ? |
|
No, where are you seeing that? |
When one of the builds fails bot cancels other jobs to save time by letting other jobs run. |
oli-obk
added
S-waiting-on-author
|
@bjorn3 x.py test --bless leaves me with 82 errors concerning for the test suite [debuginfo-gdb+lldb]. I'm also getting "error: gdb failed to execute". What is gdb's role in the compiler ? |
|
gdb is used in tests testing debuginfo. It should be fine to ignore those tests. |
|
@bjorn3 what should I look for in failed-doctest-output.rs ? Or in general ? |
|
Running |
|
Ok I ran ./x.py test --stage 1 src/test/rustdoc-ui --bless. The Tests all passed but I can't add anything to a new commit because nothing changed. @bjorn3 |
|
Maybe try rebasing this PR. If CI succeeds, this PR will be ready to go. |
|
Ping from triage - this hasn't been touched in 5 days. |
|
@bors r- |
|
@bjorn3 Could we try testing this commit with whatever we did before ? |
|
I think you messed up the rebase again. If I have to believe the PR CI, it should work fine now though. Do you want to try fixing the rebase? Or should I try? |
|
@bjorn3 If you have the time could you please fix it and tell me what you did ? Thanks so much for your patience you really have been a big help stepping me through this. |
|
I decided to make a new branch with your changes: $ git checkout master
$ git pull # Get latest changes
$ git checkout -b fix_63906 # Make new branch to apply changes
# Fetch all your commits
$ git remote add luigishat https://github.com/luigishat/rust.git
$ git fetch luigishat
# Take the commit with the actual changes and apply it to the current branch
$ git cherry-pick b139849bf1842c7cf7ea0cc78e3ddc362cb2ce02
# Change the commit message to something nicer
$ git commit --amend -m "Remove unreachable unit tuple compare binop codegen"
$ git push -u my fix_63906 # Push branch to my forkNormally you would do something like: |
Remove unreachable unit tuple compare binop codegen Closes rust-lang#63906 Fixes rust-lang#63551 This is based on rust-lang#63906 by @luigisHat, who had trouble with rebasing his PR.
Well this is my first PR so hopefully I didn't do too bad.
As said I'm attempting to fix issue #63551 and remove the unnecessary check for is_unit.
would recommend removing
let is_unit = input_ty.is_unit()unless there is another use.