Update Clippy #58807

Xanewok · 2019-02-28T12:35:41Z

Should fix the fallout caused by #58321 (still testing it locally).

r? @oli-obk

rust-highfive · 2019-02-28T12:35:51Z

⚠️ Warning ⚠️

These commits modify submodules.

Xanewok · 2019-02-28T12:36:34Z

cc #58765

Xanewok · 2019-02-28T15:02:04Z

#58754 also contains the relevant clippy update when/if that lands

ljedrz · 2019-02-28T15:26:18Z

@Xanewok #58754 has a slightly bumped priority, so it should land soon (it's currently 5th in the queue).

Oh and it will land; there's way too much further work depending on it for me to forget about it ^^.

kennytm · 2019-03-02T06:42:50Z

#58754 has been merged.

ljedrz · 2019-03-02T06:46:00Z

@kennytm unfortunately without the clippy update; now #58836 has one, but it might need a different clippy update due to tidy not allowing the custom compiletest-rs branch.

TL;DR: I think this PR should be merged (as long as it doesn't suffer from the other breakage)

Xanewok · 2019-03-02T18:39:42Z

If the API is meant to be 1-1 compatible, maybe it'd make sense to patch the compiletest-rs to point to https://github.com/rust-lang/rust/tree/master/src/tools/compiletest (just like we do with Rustfmt and clippy in-tree)? I think this should unblock the releases until Manishearth/compiletest-rs#160 is merged and a new version is released.

mati865 · 2019-03-02T19:40:10Z

@Xanewok I think that's good idea, tools upgrades would no longer be blocked when some changes break compiletest-rs.

rust-highfive · 2019-03-03T13:52:15Z

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:351d602c:start=1551620963756334604,finish=1551620964701404391,duration=945069787
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:01:57] 
######################################################################## 100.0%
[00:01:57] extracting /checkout/obj/build/cache/2019-02-27/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:57]     Updating crates.io index
[00:02:10]     Updating git repository `https://github.com/mati865/compiletest-rs.git`
[00:02:10] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:10] Build completed unsuccessfully in 0:00:25
[00:02:10] Makefile:70: recipe for target 'prepare' failed
[00:02:10] make: *** [prepare] Error 1
[00:02:11] Command failed. Attempt 2/5:
[00:02:11] Command failed. Attempt 2/5:
[00:02:11]     Updating git repository `https://github.com/mati865/compiletest-rs.git`
[00:02:12] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:12] Build completed unsuccessfully in 0:00:00
[00:02:12] Makefile:70: recipe for target 'prepare' failed
[00:02:12] make: *** [prepare] Error 1
[00:02:14] Command failed. Attempt 3/5:
[00:02:14] Command failed. Attempt 3/5:
[00:02:14]     Updating git repository `https://github.com/mati865/compiletest-rs.git`
[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:00
[00:02:14] Makefile:70: recipe for target 'prepare' failed
[00:02:14] make: *** [prepare] Error 1
[00:02:17] Command failed. Attempt 4/5:
[00:02:17] Command failed. Attempt 4/5:
[00:02:17]     Updating git repository `https://github.com/mati865/compiletest-rs.git`
[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] Makefile:70: recipe for target 'prepare' failed
[00:02:18] make: *** [prepare] Error 1
[00:02:22] Command failed. Attempt 5/5:
[00:02:22] Command failed. Attempt 5/5:
[00:02:22]     Updating git repository `https://github.com/mati865/compiletest-rs.git`
[00:02:22] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:22] Build completed unsuccessfully in 0:00:00
[00:02:22] Makefile:70: recipe for target 'prepare' failed
[00:02:22] make: *** [prepare] Error 1
[00:02:22] The command has failed after 5 attempts.
---
travis_time:end:0ece04b6:start=1551621121816047113,finish=1551621121820694936,duration=4647823
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:022a5730
$ 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:071f111a
travis_time:start:071f111a
$ 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:046dd03f
$ 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)

Xanewok · 2019-03-03T16:26:28Z

compiletest is fixed now, bumping Clippy to include the fix updating this dependency: rust-lang/rust-clippy#3838

Xanewok · 2019-03-03T17:56:03Z

Tested locally and both Clippy and RLS successfully compile now.
Bumping prio in hope of it making to the next nightly.

r? @Xanewok
@bors r+ p=1

bors · 2019-03-03T17:56:04Z

📌 Commit 2254d74e85a40cee0117120e44903a3f46e8cbc5 has been approved by Xanewok

bors · 2019-03-03T19:48:08Z

🔒 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:

git checkout update-clippy (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self update-clippy --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.

Xanewok · 2019-03-03T21:38:29Z

@bors r+

bors · 2019-03-03T21:38:30Z

📌 Commit d9afb40ed973ade3cff31b298c5014597c7de1c9 has been approved by Xanewok

bors · 2019-03-03T22:49:11Z

🔒 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:

git checkout update-clippy (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self update-clippy --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.

Xanewok · 2019-03-03T22:54:47Z

@bors r+

bors · 2019-03-03T22:54:47Z

📌 Commit 594e261 has been approved by Xanewok

bors · 2019-03-04T01:46:43Z

⌛ Testing commit 594e261 with merge 9261088...

@oli-obk

Update Clippy Should fix the fallout caused by #58321 (still testing it locally). r? @oli-obk

bors · 2019-03-04T04:46:32Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Xanewok
Pushing 9261088 to master...

rust-highfive · 2019-03-04T04:47:47Z

📣 Toolstate changed by #58807!

Tested on commit 9261088.
Direct link to PR: #58807

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

@Manishearth

Tested on commit rust-lang/rust@9261088. Direct link to PR: <rust-lang/rust#58807> 🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra). 🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive assigned oli-obk Feb 28, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 28, 2019

flip1995 mentioned this pull request Mar 2, 2019

clippy not available on nightly-x86_64-pc-windows-msvc rust-lang/rust-clippy#3836

Closed

mati865 mentioned this pull request Mar 2, 2019

update clippy #58880

Closed

Xanewok force-pushed the update-clippy branch from 0598b3e to ceabc8d Compare March 3, 2019 13:48

Xanewok force-pushed the update-clippy branch from ceabc8d to 2254d74 Compare March 3, 2019 16:25

rust-highfive assigned Xanewok and unassigned oli-obk Mar 3, 2019

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 Mar 3, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 3, 2019

Xanewok force-pushed the update-clippy branch from 2254d74 to d9afb40 Compare March 3, 2019 21:36

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 3, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 3, 2019

Update Clippy

594e261

Xanewok force-pushed the update-clippy branch from d9afb40 to 594e261 Compare March 3, 2019 22:53

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 3, 2019

bors added a commit that referenced this pull request Mar 4, 2019

Auto merge of #58807 - Xanewok:update-clippy, r=Xanewok

9261088

Update Clippy Should fix the fallout caused by #58321 (still testing it locally). r? @oli-obk

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 4, 2019

bors merged commit 594e261 into rust-lang:master Mar 4, 2019

bors mentioned this pull request Mar 4, 2019

Update compiler_builtins to 0.1.7 to get windows/arm fix #58789

Closed

Xanewok mentioned this pull request Mar 4, 2019

rls no longer builds after rust-lang/rust#58321 #58765

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Clippy #58807

Update Clippy #58807

Xanewok commented Feb 28, 2019

rust-highfive commented Feb 28, 2019

Xanewok commented Feb 28, 2019

Xanewok commented Feb 28, 2019

ljedrz commented Feb 28, 2019 •

edited

Loading

kennytm commented Mar 2, 2019

ljedrz commented Mar 2, 2019 •

edited

Loading

Xanewok commented Mar 2, 2019

mati865 commented Mar 2, 2019

rust-highfive commented Mar 3, 2019

Xanewok commented Mar 3, 2019

Xanewok commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 3, 2019

Xanewok commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 3, 2019

Xanewok commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 4, 2019

bors commented Mar 4, 2019

rust-highfive commented Mar 4, 2019

Update Clippy #58807

Update Clippy #58807

Conversation

Xanewok commented Feb 28, 2019

rust-highfive commented Feb 28, 2019

Xanewok commented Feb 28, 2019

Xanewok commented Feb 28, 2019

ljedrz commented Feb 28, 2019 • edited Loading

kennytm commented Mar 2, 2019

ljedrz commented Mar 2, 2019 • edited Loading

Xanewok commented Mar 2, 2019

mati865 commented Mar 2, 2019

rust-highfive commented Mar 3, 2019

Xanewok commented Mar 3, 2019

Xanewok commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 3, 2019

Xanewok commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 3, 2019

Xanewok commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 4, 2019

bors commented Mar 4, 2019

rust-highfive commented Mar 4, 2019

ljedrz commented Feb 28, 2019 •

edited

Loading

ljedrz commented Mar 2, 2019 •

edited

Loading