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.

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

Update Clippy #59617

Closed
wants to merge 2 commits into from
Closed

Update Clippy #59617

wants to merge 2 commits into from

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Apr 1, 2019

cc rust-lang/rust-clippy#3905
cc rust-lang/rust-clippy#3913
cc #59396

This should make Clippy appear to be test-pass. This introduces 3 Bugs to Clippy, which are tracked.

r? @Manishearth @oli-obk

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 1, 2019
@Manishearth
Copy link
Member

@bors r+ p=2

make sure this doesn't need a lockfile update to build

@bors
Copy link
Contributor

bors commented Apr 1, 2019

📌 Commit 7c0db1435438207e670aae34f73ddf69a52d91e7 has been approved by Manishearth

@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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:05ef9bba:start=1554150426454880679,finish=1554150427488767870,duration=1033887191
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
################################                                          45.0%
######################################################################## 100.0%
[00:01:59] extracting /checkout/obj/build/cache/2019-03-20/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:59]     Updating crates.io index
[00:02:14] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:14] Build completed unsuccessfully in 0:00:32
[00:02:14] make: *** [prepare] Error 1
[00:02:14] Makefile:69: recipe for target 'prepare' failed
[00:02:15] Command failed. Attempt 2/5:
[00:02:15] Command failed. Attempt 2/5:
[00:02:15] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:15] Build completed unsuccessfully in 0:00:00
[00:02:15] Makefile:69: recipe for target 'prepare' failed
[00:02:15] make: *** [prepare] Error 1
[00:02:17] Command failed. Attempt 3/5:
[00:02:17] Command failed. Attempt 3/5:
[00:02:18] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:18] Build completed unsuccessfully in 0:00:00
[00:02:18] make: *** [prepare] Error 1
[00:02:18] Makefile:69: recipe for target 'prepare' failed
[00:02:21] Command failed. Attempt 4/5:
[00:02:21] Command failed. Attempt 4/5:
[00:02:21] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:21] Build completed unsuccessfully in 0:00:00
[00:02:21] Makefile:69: recipe for target 'prepare' failed
[00:02:21] make: *** [prepare] Error 1
[00:02:25] Command failed. Attempt 5/5:
[00:02:25] Command failed. Attempt 5/5:
[00:02:25] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:25] Build completed unsuccessfully in 0:00:00
[00:02:25] make: *** [prepare] Error 1
[00:02:25] Makefile:69: recipe for target 'prepare' failed
[00:02:25] The command has failed after 5 attempts.
---
travis_time:end:0240a826:start=1554150586977850091,finish=1554150586983564460,duration=5714369
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0cd796a6
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:08463aea
travis_time:start:08463aea
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:045aecae
$ dmesg | grep -i kill

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 @TimNN. (Feature Requests)

@jonas-schievink jonas-schievink added the T-dev-tools Relevant to the dev-tools subteam, which will review and decide on the PR/issue. label Apr 1, 2019
@flip1995
Copy link
Member Author

flip1995 commented Apr 1, 2019

Yeah it needed a Cargo.lock update (Deps update in Clippy). Sorry forgot about that.

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 1, 2019

📌 Commit 718e84912c551229961ba867801e8c965823c986 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Apr 1, 2019

⌛ Testing commit 718e84912c551229961ba867801e8c965823c986 with merge dd230b9f74ce398212b329af637d56d71b770dd4...

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:00052f10:start=1554151212444418755,finish=1554151213351767797,duration=907349042
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[01:34:10]    Compiling rustc-workspace-hack v1.0.0 (/checkout/src/tools/rustc-workspace-hack)
[01:34:28]    Compiling clippy v0.0.212 (/checkout/src/tools/clippy)
[01:34:35]     Finished release [optimized] target(s) in 3m 00s
[01:34:35]      Running build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/clippy_driver-bcc57f90f2beedb3
[01:34:35] /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/clippy_driver-bcc57f90f2beedb3: symbol lookup error: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibtest-ec6093eac7e5c75c.so: undefined symbol: _ZN10rustc_term6stdout17h7477aa7f2f47c698E
[01:34:35] error: test failed, to rerun pass '--bin clippy-driver'
[01:34:35] 
[01:34:35] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/clippy/Cargo.toml" "--features" "rustc-workspace-hack/all-static"
[01:34:35] expected success, got: exit code: 127
[01:34:35] 
---
[01:47:36] Verifying status of rustfmt...
[01:47:36] Verifying status of clippy-driver...
[01:47:36] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:47:36] 
[01:47:36] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:47:36] 
[01:47:36] If you do intend to update 'clippy-driver', please check the error messages above and
[01:47:36] commit another update.
[01:47:36] 
[01:47:36] If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
[01:47:36] change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
[01:47:36] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:0843edf0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Mon Apr  1 22:28:00 UTC 2019
---
travis_time:end:12140b50:start=1554157682026058171,finish=1554157682030618691,duration=4560520
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0ba36170
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0f77cdb4
travis_time:start:0f77cdb4
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1f35f2c0
$ dmesg | grep -i kill

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Apr 1, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-mips64el-linux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

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 @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 1, 2019
@Manishearth
Copy link
Member

[01:34:35] /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/clippy_driver-bcc57f90f2beedb3: symbol lookup error: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibtest-ec6093eac7e5c75c.so: undefined symbol: _ZN10rustc_term6stdout17h7477aa7f2f47c698E

@bors
Copy link
Contributor

bors commented Apr 2, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout clippyup (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self clippyup --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@flip1995
Copy link
Member Author

flip1995 commented Apr 3, 2019

Can I do something about the unknown symbol error?

@Manishearth
Copy link
Member

I have no idea what's going on there.

@Manishearth
Copy link
Member

@gnzlbg , any idea?

@gnzlbg
Copy link
Contributor

gnzlbg commented Apr 3, 2019

We have been slowly fixing linkage / tools issues in #59440 , and now all ui tests pass, ui-fulldeps is still failing. cc @alexcrichton

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:1529d336:start=1554285346230814593,finish=1554285347103706241,duration=872891648
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[01:36:12]    Compiling rustc-workspace-hack v1.0.0 (/checkout/src/tools/rustc-workspace-hack)
[01:36:29]    Compiling clippy v0.0.212 (/checkout/src/tools/clippy)
[01:36:36]     Finished release [optimized] target(s) in 3m 02s
[01:36:36]      Running build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/clippy_driver-bcc57f90f2beedb3
[01:36:36] /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/clippy_driver-bcc57f90f2beedb3: symbol lookup error: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibtest-ec6093eac7e5c75c.so: undefined symbol: _ZN10rustc_term6stdout17h7477aa7f2f47c698E
[01:36:36] error: test failed, to rerun pass '--bin clippy-driver'
[01:36:36] 
[01:36:36] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/clippy/Cargo.toml" "--features" "rustc-workspace-hack/all-static"
[01:36:36] expected success, got: exit code: 127
[01:36:36] 
---
[01:49:59] Verifying status of rustfmt...
[01:49:59] Verifying status of clippy-driver...
[01:49:59] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:49:59] 
[01:49:59] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:49:59] 
[01:49:59] If you do intend to update 'clippy-driver', please check the error messages above and
[01:49:59] commit another update.
[01:49:59] 
[01:49:59] If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
[01:49:59] change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
[01:49:59] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:1c7c2be7
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Apr  3 11:45:57 UTC 2019
---
travis_time:end:0167ac02:start=1554291959124620329,finish=1554291959129658313,duration=5037984
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:11186a08
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0f134604
travis_time:start:0f134604
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1513ec41
$ dmesg | grep -i kill

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 @TimNN. (Feature Requests)

@alexcrichton
Copy link
Member

Sorry I do not have time to keep up with all what's going on around libtest/clippy. I have no idea why it broke in the first place or what may be needed to fix it. If this is too much of a problem we may just need to revert the extraction of libtest. I just don't have time to always be on call to debug all issues related to this right now.

@Manishearth
Copy link
Member

@alexcrichton I think the correct fix is blocked on your review at rust-lang/libtest#11 and #59440 . We're not asking you to debug things, but please review the PRs that are out there.

What's going on is that an incomplete libtest update landed, and the fix for that has not merged in weeks, and we've had to resort to some unsafe trickery to work around that. We were told the fix would land pretty quickly, but it hasn't, and in the meantime more breakages piled up.

We do plan to revert everything next week if it's not fixed yet.

@mati865
Copy link
Contributor

mati865 commented Apr 3, 2019

#59440 still fails the tests.

@alexcrichton
Copy link
Member

@Manishearth I don't really know why I'm the one this is all getting pinned on. I have already effectively approved those PRs and they're just trying to get to the point where they can actually land, they're both works in progress. I had basically nothing to do with extracting libtest other than helping out on some guidance of how to organize it. I furthermore have basically no knowledge how any of this is tied to clippy.

I realize that I'm connected tangentially to a lot of things, but I really don't have the time any more to get pulled into and cc'd on everything related to anything I used to work on.

@Manishearth
Copy link
Member

Manishearth commented Apr 3, 2019 via email

@Manishearth
Copy link
Member

To be clear, I don't quite know what the libtest situation is, however to me it seemed like @gnzlbg was blocked on you and has been for a while.

@gnzlbg
Copy link
Contributor

gnzlbg commented Apr 3, 2019

We can fix compiletest-rs on crates.io without landing any of those PRs. Is that the only thing that needs fixing @Manishearth or are there other issues ?

@Manishearth
Copy link
Member

Manishearth commented Apr 3, 2019 via email

@flip1995
Copy link
Member Author

flip1995 commented Apr 8, 2019

This is superseded by #59783

@flip1995 flip1995 closed this Apr 8, 2019
@flip1995 flip1995 deleted the clippyup branch April 8, 2019 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-dev-tools Relevant to the dev-tools subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants