Skip to content

submodules: update clippy from f1753522 to 6ce78d12 #57932

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

Merged
merged 1 commit into from
Jan 30, 2019

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jan 27, 2019

Should fix clippy toolstate

Changes:

wildcard_match_arm: Update lint count.
wildcard_match_arm: add nesting issue to known.
wildcard_match_arm: lint only enum matches.
wildcard_match_arm: update ui test stderr
wildcard_match_arm: format test.
wilcard_match_arm: run rustfmt.
wildcard_match_arm: add lint properly.
wildcard_match_arm: rename function.
wildcard_match_arm: add simple ui test.
wildcard_match_arm: expand lint scope.
Change match_wild lint name to WILDCARD_MATCH_ARM.
Add match_wild lint (#3649).
fetch_prs_between: add .sh file ending
cargo fmt
Update various docs
Use built-in entry_fn detection over self-built
cargo fmt
Reorganize conditionals: Run faster checks first
Maybe fix ICE?
Add initial version of const_fn lint
Fix `unit_arg` false positive
Rustfmt
Check hypothetically failing conversion
Remove tests for deprecated items
Update more changed iterator paths
Atomics constants are now handled by the deprecation lint
Update changed iterator paths
Update const slice processing
update test stderr
run cargo fmt
rustup https://github.com/rust-lang/rust/pull/57907/
Fix documentation for `slow_vector_initialization`
rustup https://github.com/rust-lang/rust/pull/57726
Remove unsafe_vector_initialization from added lints
Prevent incorrect cast_lossless suggestion in const_fn
Incorporate review suggestions
Fix dogfood tests on Appveyor
test(versioncheck): Use .no_deps()
test(versioncheck): Fix version equality check
chore(cargo/dependencies/cargo-metadata): Upgrade to 0.7.1
dependencies: update itertools from 0.7 to 0.8
Add script to fetch GitHub PRs between two commits
gitattributes: Treat .fixed files as rust files
Update changelog with all changes since 0.0.212
Fix `expect_fun_call` lint suggestions

r? @oli-obk

@rust-highfive
Copy link
Contributor

⚠️ 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 Jan 27, 2019
@rust-highfive
Copy link
Contributor

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:0104e220:start=1548596503910606575,finish=1548596504830547663,duration=919941088
$ 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:31] 
######################################################################## 100.0%
[00:01:32] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:32]     Updating crates.io index
[00:01:42] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:42] Build completed unsuccessfully in 0:00:25
[00:01:42] make: *** [prepare] Error 1
[00:01:42] Makefile:70: recipe for target 'prepare' failed
[00:01:43] Command failed. Attempt 2/5:
[00:01:43] Command failed. Attempt 2/5:
[00:01:43]     Updating crates.io index
[00:01:44] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:44] Build completed unsuccessfully in 0:00:00
[00:01:44] make: *** [prepare] Error 1
[00:01:44] Makefile:70: recipe for target 'prepare' failed
[00:01:46] Command failed. Attempt 3/5:
[00:01:46] Command failed. Attempt 3/5:
[00:01:46]     Updating crates.io index
[00:01:46] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:46] Build completed unsuccessfully in 0:00:00
[00:01:46] make: *** [prepare] Error 1
[00:01:46] Makefile:70: recipe for target 'prepare' failed
[00:01:49] Command failed. Attempt 4/5:
[00:01:49] Command failed. Attempt 4/5:
[00:01:49]     Updating crates.io index
[00:01:50] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:50] Build completed unsuccessfully in 0:00:00
[00:01:50] Makefile:70: recipe for target 'prepare' failed
[00:01:50] make: *** [prepare] Error 1
[00:01:54] Command failed. Attempt 5/5:
[00:01:54] Command failed. Attempt 5/5:
[00:01:54]     Updating crates.io index
[00:01:55] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:55] Build completed unsuccessfully in 0:00:00
[00:01:55] Makefile:70: recipe for target 'prepare' failed
[00:01:55] make: *** [prepare] Error 1
[00:01:55] The command has failed after 5 attempts.
---
travis_time:end:1e8f6b8c:start=1548596635015195825,finish=1548596635022658102,duration=7462277
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1efd3954
$ 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:0490bdcb
travis_time:start:0490bdcb
$ 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:24bf1cc8
$ 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)

@oli-obk
Copy link
Contributor

oli-obk commented Jan 27, 2019

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Jan 27, 2019

📌 Commit 5eb254734aa9721a47c8495f60d32cdbf8d61940 has been approved by oli-obk

@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 Jan 27, 2019
@Centril
Copy link
Contributor

Centril commented Jan 27, 2019

Adjusting queue order for rollups:
@bors p=2

@bors
Copy link
Collaborator

bors commented Jan 28, 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 clippy_submodule_upd (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 clippy_submodule_upd --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 Jan 28, 2019
@matthiaskrgr
Copy link
Member Author

rebased

@rust-highfive
Copy link
Contributor

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:201a0023:start=1548654816817273338,finish=1548654817768772249,duration=951498911
$ 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
---
#######################################################                   77.4%
######################################################################## 100.0%
[00:02:15] extracting /checkout/obj/build/cache/2019-01-18/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:15]     Updating crates.io index
[00:02:26] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:26] Build completed unsuccessfully in 0:00:32
[00:02:26] make: *** [prepare] Error 1
[00:02:26] Makefile:70: recipe for target 'prepare' failed
[00:02:27] Command failed. Attempt 2/5:
[00:02:27] Command failed. Attempt 2/5:
[00:02:27]     Updating crates.io index
[00:02:27] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:27] Build completed unsuccessfully in 0:00:00
[00:02:27] make: *** [prepare] Error 1
[00:02:27] Makefile:70: recipe for target 'prepare' failed
[00:02:29] Command failed. Attempt 3/5:
[00:02:29] Command failed. Attempt 3/5:
[00:02:29]     Updating crates.io index
[00:02:30] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:30] Build completed unsuccessfully in 0:00:00
[00:02:30] Makefile:70: recipe for target 'prepare' failed
[00:02:30] make: *** [prepare] Error 1
[00:02:33] Command failed. Attempt 4/5:
[00:02:33] Command failed. Attempt 4/5:
[00:02:33]     Updating crates.io index
[00:02:33] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:33] Build completed unsuccessfully in 0:00:00
[00:02:33] make: *** [prepare] Error 1
[00:02:33] Makefile:70: recipe for target 'prepare' failed
[00:02:37] Command failed. Attempt 5/5:
[00:02:37] Command failed. Attempt 5/5:
[00:02:37]     Updating crates.io index
[00:02:38] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:38] Build completed unsuccessfully in 0:00:00
[00:02:38] Makefile:70: recipe for target 'prepare' failed
[00:02:38] make: *** [prepare] Error 1
[00:02:38] The command has failed after 5 attempts.
---
travis_time:end:2170f8ba:start=1548654990355502093,finish=1548654990361212371,duration=5710278
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:120f30e2
$ 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:23faba66
travis_time:start:23faba66
$ 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:010bbd90
$ 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)

@matthiaskrgr
Copy link
Member Author

Clippy needs to be fixed again...

@matthiaskrgr matthiaskrgr changed the title submodules: update clippy from f1753522 to 13421e39 [WIP] submodules: update clippy from f1753522 to 13421e39 Jan 28, 2019
@matthiaskrgr matthiaskrgr changed the title [WIP] submodules: update clippy from f1753522 to 13421e39 [WIP] submodules: update clippy from f1753522 to 4a2116b3 Jan 28, 2019
@matthiaskrgr matthiaskrgr changed the title [WIP] submodules: update clippy from f1753522 to 4a2116b3 submodules: update clippy from f1753522 to 4a2116b3 Jan 28, 2019
@matthiaskrgr matthiaskrgr changed the title submodules: update clippy from f1753522 to 4a2116b3 submodules: update clippy and rls Jan 28, 2019
@matthiaskrgr
Copy link
Member Author

I pulled in an rls update since this needs update as well

@rust-highfive

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Jan 29, 2019

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Jan 29, 2019

📌 Commit f8122382e9fcf8e761a2aaa65fdbc84ed62ec889 has been approved by oli-obk

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 29, 2019
@matthiaskrgr matthiaskrgr changed the title submodules: update clippy and rls submodules: update clippy Jan 29, 2019
@matthiaskrgr
Copy link
Member Author

I removed the rls update again..

I wonder if if the rls hang has something to do with debug assertions...
r? @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Jan 29, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 29, 2019

📌 Commit b076f8260fd273438de896d2c42dffb28d0ff153 has been approved by oli-obk

@bors
Copy link
Collaborator

bors commented Jan 29, 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 clippy_submodule_upd (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 clippy_submodule_upd --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 Jan 29, 2019
@matthiaskrgr
Copy link
Member Author

That's strange, I can't see any changes to Cargo.lock in the recent PRs...

@mati865
Copy link
Contributor

mati865 commented Jan 29, 2019

PR merged 7 hours ago made small changes to the lockfile and bors is very picky about merge conflicts.
I bet it surfaced so late because bors was about to run tests. You will have to rebase it and somebody needs to reapprove it.

Changes:
````
wildcard_match_arm: Update lint count.
wildcard_match_arm: add nesting issue to known.
wildcard_match_arm: lint only enum matches.
wildcard_match_arm: update ui test stderr
wildcard_match_arm: format test.
wilcard_match_arm: run rustfmt.
wildcard_match_arm: add lint properly.
wildcard_match_arm: rename function.
wildcard_match_arm: add simple ui test.
wildcard_match_arm: expand lint scope.
Change match_wild lint name to WILDCARD_MATCH_ARM.
Add match_wild lint (rust-lang#3649).
fetch_prs_between: add .sh file ending
cargo fmt
Update various docs
Use built-in entry_fn detection over self-built
cargo fmt
Reorganize conditionals: Run faster checks first
Maybe fix ICE?
Add initial version of const_fn lint
Fix `unit_arg` false positive
Rustfmt
Check hypothetically failing conversion
Remove tests for deprecated items
Update more changed iterator paths
Atomics constants are now handled by the deprecation lint
Update changed iterator paths
Update const slice processing
update test stderr
run cargo fmt
rustup rust-lang#57907
Fix documentation for `slow_vector_initialization`
rustup rust-lang#57726
Remove unsafe_vector_initialization from added lints
Prevent incorrect cast_lossless suggestion in const_fn
Incorporate review suggestions
Fix dogfood tests on Appveyor
test(versioncheck): Use .no_deps()
test(versioncheck): Fix version equality check
chore(cargo/dependencies/cargo-metadata): Upgrade to 0.7.1
dependencies: update itertools from 0.7 to 0.8
Add script to fetch GitHub PRs between two commits
gitattributes: Treat .fixed files as rust files
Update changelog with all changes since 0.0.212
Fix `expect_fun_call` lint suggestions
````
@matthiaskrgr matthiaskrgr changed the title submodules: update clippy submodules: update clippy from f1753522 to 6ce78d12 Jan 30, 2019
@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Jan 30, 2019

updated once again

@oli-obk
Copy link
Contributor

oli-obk commented Jan 30, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 30, 2019

📌 Commit a27cf8a has been approved by oli-obk

@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 Jan 30, 2019
@bors
Copy link
Collaborator

bors commented Jan 30, 2019

⌛ Testing commit a27cf8a with merge 43b4c4a...

bors added a commit that referenced this pull request Jan 30, 2019
submodules: update clippy from f175352 to 6ce78d1

Should fix clippy toolstate

Changes:
````
wildcard_match_arm: Update lint count.
wildcard_match_arm: add nesting issue to known.
wildcard_match_arm: lint only enum matches.
wildcard_match_arm: update ui test stderr
wildcard_match_arm: format test.
wilcard_match_arm: run rustfmt.
wildcard_match_arm: add lint properly.
wildcard_match_arm: rename function.
wildcard_match_arm: add simple ui test.
wildcard_match_arm: expand lint scope.
Change match_wild lint name to WILDCARD_MATCH_ARM.
Add match_wild lint (#3649).
fetch_prs_between: add .sh file ending
cargo fmt
Update various docs
Use built-in entry_fn detection over self-built
cargo fmt
Reorganize conditionals: Run faster checks first
Maybe fix ICE?
Add initial version of const_fn lint
Fix `unit_arg` false positive
Rustfmt
Check hypothetically failing conversion
Remove tests for deprecated items
Update more changed iterator paths
Atomics constants are now handled by the deprecation lint
Update changed iterator paths
Update const slice processing
update test stderr
run cargo fmt
rustup #57907
Fix documentation for `slow_vector_initialization`
rustup #57726
Remove unsafe_vector_initialization from added lints
Prevent incorrect cast_lossless suggestion in const_fn
Incorporate review suggestions
Fix dogfood tests on Appveyor
test(versioncheck): Use .no_deps()
test(versioncheck): Fix version equality check
chore(cargo/dependencies/cargo-metadata): Upgrade to 0.7.1
dependencies: update itertools from 0.7 to 0.8
Add script to fetch GitHub PRs between two commits
gitattributes: Treat .fixed files as rust files
Update changelog with all changes since 0.0.212
Fix `expect_fun_call` lint suggestions
````

r? @oli-obk
@bors
Copy link
Collaborator

bors commented Jan 30, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 43b4c4a to master...

@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #57932!

Tested on commit 43b4c4a.
Direct link to PR: #57932

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 30, 2019
Tested on commit rust-lang/rust@43b4c4a.
Direct link to PR: <rust-lang/rust#57932>

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
@bors
Copy link
Collaborator

bors commented Jan 30, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 43b4c4a to master...

@bors bors merged commit a27cf8a into rust-lang:master Jan 30, 2019
bors added a commit to rust-lang/rls that referenced this pull request Jan 31, 2019
@matthiaskrgr matthiaskrgr deleted the clippy_submodule_upd branch April 8, 2019 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants