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

Merged
merged 1 commit into from
Jun 4, 2019
Merged

Update clippy #61467

merged 1 commit into from
Jun 4, 2019

Conversation

Manishearth
Copy link
Member

r? @ghost

@Manishearth
Copy link
Member Author

@bors r+ p=2

@bors
Copy link
Contributor

bors commented Jun 2, 2019

📌 Commit bfa1e2a4c9538f67ea4f5a17f61d986e4a8106ed has been approved by Manishearth

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 2, 2019
@bors
Copy link
Contributor

bors commented Jun 2, 2019

⌛ Testing commit bfa1e2a4c9538f67ea4f5a17f61d986e4a8106ed with merge ce7c5b0d179a2f52a7fd66b8b2ad0596a51bcc0b...

@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:005af703:start=1559506999528360217,finish=1559507000326258756,duration=797898539
$ 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
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
############################################                              61.5%
######################################################################## 100.0%
[00:01:38] extracting /checkout/obj/build/cache/2019-05-23/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:38]     Updating crates.io index
[00:01:57] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:57] Build completed unsuccessfully in 0:00:32
[00:01:57] Makefile:69: recipe for target 'prepare' failed
[00:01:57] make: *** [prepare] Error 1
[00:01:58] Command failed. Attempt 2/5:
[00:01:58] Command failed. Attempt 2/5:
[00:01:58]     Updating crates.io index
[00:01:58] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:58] Build completed unsuccessfully in 0:00:00
[00:01:58] Makefile:69: recipe for target 'prepare' failed
[00:01:58] make: *** [prepare] Error 1
[00:02:00] Command failed. Attempt 3/5:
[00:02:00] Command failed. Attempt 3/5:
[00:02:01]     Updating crates.io index
[00:02:01] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:01] Build completed unsuccessfully in 0:00:00
[00:02:01] Makefile:69: recipe for target 'prepare' failed
[00:02:01] make: *** [prepare] Error 1
[00:02:04] Command failed. Attempt 4/5:
[00:02:04] Command failed. Attempt 4/5:
[00:02:04]     Updating crates.io index
[00:02:04] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:04] Build completed unsuccessfully in 0:00:00
[00:02:04] make: *** [prepare] Error 1
[00:02:04] Makefile:69: recipe for target 'prepare' failed
[00:02:08] Command failed. Attempt 5/5:
[00:02:08] Command failed. Attempt 5/5:
[00:02:09]     Updating crates.io index
[00:02:09] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:09] Build completed unsuccessfully in 0:00:00
[00:02:09] make: *** [prepare] Error 1
[00:02:09] Makefile:69: recipe for target 'prepare' failed
[00:02:09] The command has failed after 5 attempts.
---
travis_time:end:0d77300c:start=1559507141316852170,finish=1559507141323047443,duration=6195273
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:22c6ab7a
$ 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:0adecd88
travis_time:start:0adecd88
$ 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:05fa2ca0
$ 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)

@Manishearth
Copy link
Member Author

@bors r+ p=2

@bors
Copy link
Contributor

bors commented Jun 2, 2019

📌 Commit ec33b079f70bbfe32671eb7b170295aabef182d6 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jun 2, 2019

⌛ Testing commit ec33b079f70bbfe32671eb7b170295aabef182d6 with merge 4664e91029d111a1e4e56747b4cc1fdca3ece785...

@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.
[00:01:57] 
######################################################################## 100.0%
[00:01:58] extracting /checkout/obj/build/cache/2019-05-23/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:58]     Updating crates.io index
[00:02:16] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:16] Build completed unsuccessfully in 0:00:31
[00:02:16] Makefile:69: recipe for target 'prepare' failed
[00:02:16] make: *** [prepare] Error 1
[00:02:17] Command failed. Attempt 2/5:
[00:02:17] Command failed. Attempt 2/5:
[00:02:17]     Updating crates.io index
[00:02:17] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:17] Build completed unsuccessfully in 0:00:00
[00:02:17] Makefile:69: recipe for target 'prepare' failed
[00:02:17] make: *** [prepare] Error 1
[00:02:19] Command failed. Attempt 3/5:
[00:02:19] Command failed. Attempt 3/5:
[00:02:19]     Updating crates.io index
[00:02:20] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:20] Build completed unsuccessfully in 0:00:00
[00:02:20] Makefile:69: recipe for target 'prepare' failed
[00:02:20] make: *** [prepare] Error 1
[00:02:23] Command failed. Attempt 4/5:
[00:02:23] Command failed. Attempt 4/5:
[00:02:23]     Updating crates.io index
[00:02:23] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:23] Build completed unsuccessfully in 0:00:00
[00:02:23] make: *** [prepare] Error 1
[00:02:23] Makefile:69: recipe for target 'prepare' failed
[00:02:27] Command failed. Attempt 5/5:
[00:02:27] Command failed. Attempt 5/5:
[00:02:27]     Updating crates.io index
[00:02:28] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:28] Build completed unsuccessfully in 0:00:00
[00:02:28] Makefile:69: recipe for target 'prepare' failed
[00:02:28] The command has failed after 5 attempts.
[00:02:28] make: *** [prepare] Error 1
---
travis_time:end:35a6dc38:start=1559507309497875640,finish=1559507309505057004,duration=7181364
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0525f7e0
$ 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:03501ad8
travis_time:start:03501ad8
$ 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:00923080
$ 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 Jun 2, 2019

💔 Test failed - status-appveyor

@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 Jun 2, 2019
@Manishearth
Copy link
Member Author

I did update the lockfile. Hmm.

@Manishearth
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jun 3, 2019

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Add more detail to type inference error #61361

@bors
Copy link
Contributor

bors commented Jun 3, 2019

📌 Commit ec33b079f70bbfe32671eb7b170295aabef182d6 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 Jun 3, 2019
@Manishearth
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jun 3, 2019

📌 Commit e67ff313ed5f514eafaa574751e6cc09c00b63d8 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jun 3, 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.

@bors 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 Jun 3, 2019
@Manishearth
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jun 3, 2019

📌 Commit 8704947 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2019
@bors
Copy link
Contributor

bors commented Jun 4, 2019

⌛ Testing commit 8704947 with merge 0b2e0a2859b430e61b186541931a63fd1d7abadf...

@Centril
Copy link
Contributor

Centril commented Jun 4, 2019

@bors retry

@bors
Copy link
Contributor

bors commented Jun 4, 2019

⌛ Testing commit 8704947 with merge dc7c4aa...

bors added a commit that referenced this pull request Jun 4, 2019
@bors
Copy link
Contributor

bors commented Jun 4, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 4, 2019
@bors bors merged commit 8704947 into rust-lang:master Jun 4, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61467!

Tested on commit dc7c4aa.
Direct link to PR: #61467

🎉 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 @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 4, 2019
Tested on commit rust-lang/rust@dc7c4aa.
Direct link to PR: <rust-lang/rust#61467>

🎉 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 @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants