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 #59396

Closed
wants to merge 1 commit into from
Closed

Update clippy #59396

wants to merge 1 commit into from

Conversation

Manishearth
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@Manishearth
Copy link
Member Author

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 24, 2019
@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:01b10397:start=1553403288331944254,finish=1553403289282570440,duration=950626186
$ 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:59:54] Verifying status of rustfmt...
[01:59:54] Verifying status of clippy-driver...
[01:59:54] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:59:54] 
[01:59:54] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:59:54] 
[01:59:54] If you do intend to update 'clippy-driver', please check the error messages above and
[01:59:54] commit another update.
307368 ./obj/build/bootstrap/debug/deps
283312 ./src/llvm-project/llvm/test
271528 ./obj/build/x86_64-unknown-linux-gnu/llvm/build/lib/Target
270748 ./obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib
---
155916 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release
153076 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps
143724 ./obj/build/x86_64-unknown-linux-gnu/stage2-tools/release
142512 ./obj/build/bootstrap/debug/incremental/bootstrap-pz4opbgkzvy
142508 ./obj/build/bootstrap/debug/incremental/bootstrap-pz4opbgkzvy/s-famvoi1zxg-968hsz-3u618d595ya6l
122772 ./obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps
108532 ./src/llvm-project/lldb
98628 ./obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends
98516 ./obj/build/x86_64-unknown-linux-gnu/llvm/build/lib/Target/X86
---
travis_time:end:0bf50862:start=1553410495188586063,finish=1553410495193392809,duration=4806746
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:10e862e9
$ 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:11c98cfe
travis_time:start:11c98cfe
$ 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

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)

@oli-obk
Copy link
Contributor

oli-obk commented Mar 24, 2019

This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:59:54]
[01:59:54] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:59:54]
[01:59:54] If you do intend to update 'clippy-driver', please check the error messages above and
[01:59:54] commit another update.

Maybe we should just protect against not increasing the state instead of requiring us to go all the way to test-pass? cc @kennytm

@kennytm

This comment has been minimized.

@mati865
Copy link
Contributor

mati865 commented Mar 24, 2019

Shouldn't compiletest-rs be patched to src/tools/compiletest?

@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

@mati865 No such patch exists in our Cargo.toml

rust/Cargo.toml

Lines 57 to 69 in fb5ed48

[patch.crates-io]
# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
# that we're shipping as well (to ensure that the rustfmt in RLS and the
# `rustfmt` executable are the same exact version).
rustfmt-nightly = { path = "src/tools/rustfmt" }
# See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
# here
rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
# See comments in `tools/rustc-std-workspace-core/README.md` for what's going on
# here
rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }

@Manishearth
Copy link
Member Author

Manishearth commented Mar 24, 2019 via email

@Manishearth
Copy link
Member Author

What does "commit another update" mean here? How do I tell travis to ignore this?

compiletest-rs 0.20 is yanked at the moment.

@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

@Manishearth you can't tell the CI to ignore this, bors will need to ensure it is test-pass eventually.

@Manishearth
Copy link
Member Author

@kennytm wait, how? I thought we didn't gate on submodule failures

@Manishearth
Copy link
Member Author

Oh, are you saying that landing this will still work even if travis doesn't like it?

Care to r+?

@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

@Manishearth We do gate on failure on the submodules you're going to update, i.e. clippy in this PR.

@Manishearth
Copy link
Member Author

I don't understand, then how was clippy broken in the first place?

What's the difference between this PR (which fixes clippy, but has the tests still fail) and the libtest PR that caused the breakage?

@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

This PR only fixed the built-fail caused by #59096, but not the test-fail caused by #57842.

The libtest PR #57842 which caused the clippy breakage did not update the clippy submodule. The test-pass gate is only applied when you specifically change src/tools/clippy.

@Manishearth
Copy link
Member Author

Manishearth commented Mar 24, 2019 via email

@kennytm kennytm added P-high High priority S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 24, 2019
@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

There are currently 2 solutions to solve this,

  1. Wait for libtest fix,

  2. Relax the gate so that as long as the toolstate is strictly improved we give it a pass, as suggested in Update clippy #59396 (comment).

    if grep -vq '"'"$1"'":"test-pass"' "$TOOLSTATE_FILE"; then

@kennytm kennytm added the T-dev-tools Relevant to the dev-tools subteam, which will review and decide on the PR/issue. label Mar 24, 2019
@flip1995 flip1995 mentioned this pull request Apr 1, 2019
@Manishearth
Copy link
Member Author

#59783

@apiraino apiraino removed the P-high High priority label Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked Status: Blocked on something else such as an RFC or other implementation work. 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.

7 participants