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 and rls #64604

Merged
merged 2 commits into from
Sep 22, 2019
Merged

Update clippy and rls #64604

merged 2 commits into from
Sep 22, 2019

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Sep 19, 2019

@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 Sep 19, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Sep 19, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Sep 19, 2019

📌 Commit 202e0ac44c1d5c36ff4750a2df47e3217935d728 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 Sep 19, 2019
@bors
Copy link
Contributor

bors commented Sep 19, 2019

⌛ Testing commit 202e0ac44c1d5c36ff4750a2df47e3217935d728 with merge 56f22b3d068befa0edb6bebe8a97d030d9c344ce...

@bors
Copy link
Contributor

bors commented Sep 19, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed (pretty log, 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.
2019-09-19T18:22:41.3435678Z == clock drift check ==
2019-09-19T18:22:41.3456334Z   local time: Thu Sep 19 18:22:41 UTC 2019
2019-09-19T18:22:41.4098856Z   network time: Thu, 19 Sep 2019 18:22:41 GMT
2019-09-19T18:22:41.4103566Z == end clock drift check ==
2019-09-19T18:22:42.0954902Z ##[error]Bash exited with code '1'.
2019-09-19T18:22:42.0997845Z ##[section]Starting: Upload CPU usage statistics
2019-09-19T18:22:42.1010259Z ==============================================================================
2019-09-19T18:22:42.1010379Z Task         : Bash
2019-09-19T18:22:42.1010452Z Description  : Run a Bash script on macOS, Linux, or Windows

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 Sep 19, 2019
@tesuji
Copy link
Contributor Author

tesuji commented Sep 19, 2019

2019-09-19T18:22:41.3307957Z The state of "clippy-driver" has changed from "build-fail" to "test-pass"
2019-09-19T18:22:41.3308802Z The state of "rls" has changed from "test-pass" to "build-fail"
2019-09-19T18:22:41.3416512Z The state of "rls" has regressed from "test-pass" to "build-fail"

cc @Xanewok

@mati865
Copy link
Contributor

mati865 commented Sep 19, 2019

^^

2019-09-19T18:06:26.4266026Z error[E0433]: failed to resolve: could not find `rustc_driver` in `self`
2019-09-19T18:06:26.4266525Z --> src/tools/rls/rls-rustc/src/clippy.rs:52:15
2019-09-19T18:06:26.4266824Z |
2019-09-19T18:06:26.4268557Z 52 | use self::rustc_driver::plugin::registry::Registry;
2019-09-19T18:06:26.4269338Z | ^^^^^^^^^^^^ could not find `rustc_driver` in `self`

I think it was not found during RLS update because this code is guarded by #[cfg(feature = "clippy")] and clippy feature was disabled because Clippy didn't build.

Xanewok added a commit to rust-lang/rls that referenced this pull request Sep 20, 2019
@msizanoen1
Copy link
Contributor

rust-lang/rls#1556 has been merged. You may want to update RLS too.

@tesuji tesuji changed the title Update clippy Update clippy and rls Sep 21, 2019
@tesuji
Copy link
Contributor Author

tesuji commented Sep 21, 2019

Done. Thanks @msizanoen1. Ping @oli-obk

@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, 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.
2019-09-21T08:38:12.4806183Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-21T08:38:13.4357320Z ##[command]git config gc.auto 0
2019-09-21T08:38:13.4360686Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-21T08:38:13.4377539Z ##[command]git config --get-all http.proxy
2019-09-21T08:38:13.4383874Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64604/merge:refs/remotes/pull/64604/merge
---
2019-09-21T08:42:30.3576594Z == clock drift check ==
2019-09-21T08:42:30.3594986Z   local time: Sat Sep 21 08:42:30 UTC 2019
2019-09-21T08:42:30.6379867Z   network time: Sat, 21 Sep 2019 08:42:30 GMT
2019-09-21T08:42:30.6380778Z == end clock drift check ==
2019-09-21T08:42:31.7512228Z ##[error]Bash exited with code '1'.
2019-09-21T08:42:31.7546068Z ##[section]Starting: Checkout
2019-09-21T08:42:31.7547917Z ==============================================================================
2019-09-21T08:42:31.7548129Z Task         : Get sources
2019-09-21T08:42:31.7548178Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 Sep 21, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Sep 21, 2019

📌 Commit 074871e 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 Sep 21, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Sep 21, 2019

Please investigate why we now have two pulldown versions and deduplicate them by using the newer one everywhere

@tesuji
Copy link
Contributor Author

tesuji commented Sep 21, 2019

Clippy have just updated pulldown-cmark. We need mdbook updated too.

Edit: But there's a problem: rust-lang/mdBook#1021

@bors
Copy link
Contributor

bors commented Sep 22, 2019

⌛ Testing commit 074871e with merge f177de6...

bors added a commit that referenced this pull request Sep 22, 2019
@bors
Copy link
Contributor

bors commented Sep 22, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed (pretty log, 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.
2019-09-22T13:40:50.1143669Z test [ui] ui/float_cmp_const.rs ... ok
2019-09-22T13:40:50.6580476Z test [ui] ui/fn_to_numeric_cast.rs ... ok
2019-09-22T13:40:50.7552302Z test [ui] ui/for_kv_map.rs ... ok
2019-09-22T13:40:51.4112598Z test [ui] ui/for_loop_over_option_result.rs ... ok
2019-09-22T13:40:52.2298157Z test [ui] ui/for_loop_unfixable.rs ... ok
2019-09-22T13:40:53.1455730Z test [ui] ui/for_loop_fixable.rs ... ok
2019-09-22T13:40:53.7396784Z test [ui] ui/format.rs ... ok
2019-09-22T13:40:54.2781639Z test [ui] ui/functions.rs ... ok
2019-09-22T13:40:54.4426206Z test [ui] ui/functions_maxlines.rs ... ok
2019-09-22T13:40:55.4300371Z test [ui] ui/get_last_with_len.rs ... ok
---
2019-09-22T13:42:08.2132073Z normalized stderr:
2019-09-22T13:42:08.2132489Z error: This generic shadows the built-in type `u32`
2019-09-22T13:42:08.2132773Z   --> $DIR/builtin-type-shadow.rs:4:8
2019-09-22T13:42:08.2133102Z    |
2019-09-22T13:42:08.2133463Z LL | fn foo<u32>(a: u32) -> u32 {
2019-09-22T13:42:08.2133862Z    |
2019-09-22T13:42:08.2134254Z    = note: `-D clippy::builtin-type-shadow` implied by `-D warnings`
2019-09-22T13:42:08.2134460Z 
2019-09-22T13:42:08.2134577Z error[E0308]: mismatched types
2019-09-22T13:42:08.2134577Z error[E0308]: mismatched types
2019-09-22T13:42:08.2135219Z   --> $DIR/builtin-type-shadow.rs:5:5
2019-09-22T13:42:08.2135328Z    |
2019-09-22T13:42:08.2135847Z LL | fn foo<u32>(a: u32) -> u32 {
2019-09-22T13:42:08.2136338Z    |                        --- expected `u32` because of return type
2019-09-22T13:42:08.2136696Z    |     ^^ expected type parameter, found integer
2019-09-22T13:42:08.2136786Z    |
2019-09-22T13:42:08.2136864Z    = note: expected type `u32`
2019-09-22T13:42:08.2136864Z    = note: expected type `u32`
2019-09-22T13:42:08.2136936Z               found type `{integer}`
2019-09-22T13:42:08.2137433Z    = help: type parameters must be constrained to match other types
2019-09-22T13:42:08.2137911Z    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
2019-09-22T13:42:08.2138417Z error: aborting due to 2 previous errors
2019-09-22T13:42:08.2138498Z 
2019-09-22T13:42:08.2139005Z For more information about this error, try `rustc --explain E0308`.
2019-09-22T13:42:08.2139226Z 
2019-09-22T13:42:08.2139226Z 
2019-09-22T13:42:08.2139297Z 
2019-09-22T13:42:08.2139377Z expected stderr:
2019-09-22T13:42:08.2139710Z error: This generic shadows the built-in type `u32`
2019-09-22T13:42:08.2140155Z   --> $DIR/builtin-type-shadow.rs:4:8
2019-09-22T13:42:08.2140373Z    |
2019-09-22T13:42:08.2140702Z LL | fn foo<u32>(a: u32) -> u32 {
2019-09-22T13:42:08.2140994Z    |
2019-09-22T13:42:08.2141359Z    = note: `-D clippy::builtin-type-shadow` implied by `-D warnings`
2019-09-22T13:42:08.2141431Z 
2019-09-22T13:42:08.2141647Z error[E0308]: mismatched types
2019-09-22T13:42:08.2141647Z error[E0308]: mismatched types
2019-09-22T13:42:08.2141966Z   --> $DIR/builtin-type-shadow.rs:5:5
2019-09-22T13:42:08.2142188Z    |
2019-09-22T13:42:08.2142513Z LL | fn foo<u32>(a: u32) -> u32 {
2019-09-22T13:42:08.2142985Z    |                        --- expected `u32` because of return type
2019-09-22T13:42:08.2143333Z    |     ^^ expected type parameter, found integer
2019-09-22T13:42:08.2143421Z    |
2019-09-22T13:42:08.2143608Z    = note: expected type `u32`
2019-09-22T13:42:08.2143608Z    = note: expected type `u32`
2019-09-22T13:42:08.2143709Z               found type `{integer}`
2019-09-22T13:42:08.2143872Z error: aborting due to 2 previous errors
2019-09-22T13:42:08.2143918Z 
2019-09-22T13:42:08.2144281Z For more information about this error, try `rustc --explain E0308`.
2019-09-22T13:42:08.2144465Z 
2019-09-22T13:42:08.2144465Z 
2019-09-22T13:42:08.2144551Z 
2019-09-22T13:42:08.2144634Z diff of stderr:
2019-09-22T13:42:08.2144689Z 
2019-09-22T13:42:08.2145455Z  error: This generic shadows the built-in type `u32`
2019-09-22T13:42:08.2145957Z    --> $DIR/builtin-type-shadow.rs:4:8
2019-09-22T13:42:08.2146178Z     |
2019-09-22T13:42:08.2146505Z  LL | fn foo<u32>(a: u32) -> u32 {
2019-09-22T13:42:08.2146826Z     |
2019-09-22T13:42:08.2147195Z     = note: `-D clippy::builtin-type-shadow` implied by `-D warnings`
2019-09-22T13:42:08.2147279Z  
2019-09-22T13:42:08.2147359Z  error[E0308]: mismatched types
2019-09-22T13:42:08.2147359Z  error[E0308]: mismatched types
2019-09-22T13:42:08.2147679Z    --> $DIR/builtin-type-shadow.rs:5:5
2019-09-22T13:42:08.2147914Z     |
2019-09-22T13:42:08.2148244Z  LL | fn foo<u32>(a: u32) -> u32 {
2019-09-22T13:42:08.2148713Z     |                        --- expected `u32` because of return type
2019-09-22T13:42:08.2149078Z     |     ^^ expected type parameter, found integer
2019-09-22T13:42:08.2149170Z     |
2019-09-22T13:42:08.2149267Z     = note: expected type `u32`
2019-09-22T13:42:08.2149267Z     = note: expected type `u32`
2019-09-22T13:42:08.2149358Z                found type `{integer}`
2019-09-22T13:42:08.2149487Z +   = help: type parameters must be constrained to match other types
2019-09-22T13:42:08.2149911Z +   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
2019-09-22T13:42:08.2150268Z  error: aborting due to 2 previous errors
2019-09-22T13:42:08.2150359Z  
2019-09-22T13:42:08.2150718Z  For more information about this error, try `rustc --explain E0308`.
2019-09-22T13:42:08.2150952Z  
---
2019-09-22T13:42:08.2156956Z 
2019-09-22T13:42:08.2157206Z ------------------------------------------
2019-09-22T13:42:08.2157295Z stderr:
2019-09-22T13:42:08.2157754Z ------------------------------------------
2019-09-22T13:42:08.2159267Z {"message":"This generic shadows the built-in type `u32`","code":{"code":"clippy::builtin_type_shadow","explanation":null},"level":"error","spans":[{"file_name":"tests/ui/builtin-type-shadow.rs","byte_start":78,"byte_end":81,"line_start":4,"line_end":4,"column_start":8,"column_end":11,"is_primary":true,"text":[{"text":"fn foo<u32>(a: u32) -> u32 {","highlight_start":8,"highlight_end":11}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`-D clippy::builtin-type-shadow` implied by `-D warnings`","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"error: This generic shadows the built-in type `u32`\n  --> tests/ui/builtin-type-shadow.rs:4:8\n   |\nLL | fn foo<u32>(a: u32) -> u32 {\n   |        ^^^\n   |\n   = note: `-D clippy::builtin-type-shadow` implied by `-D warnings`\n\n"}
2019-09-22T13:42:08.2163352Z {"message":"mismatched types","code":{"code":"E0308","explanation":"\nThis error occurs when the compiler was unable to infer the concrete type of a\nvariable. It can occur for several cases, the most common of which is a\nmismatch in the expected type that the compiler inferred for a variable's\ninitializing expression, and the actual type explicitly assigned to the\nvariable.\n\nFor example:\n\n```compile_fail,E0308\nlet x: i32 = \"I am not a number!\";\n//     ~~~   ~~~~~~~~~~~~~~~~~~~~\n//      |             |\n//      |    initializing expression;\n//      |    compiler infers type `&str`\n//      |\n//    type `i32` assigned to variable `x`\n```\n"},"level":"error","spans":[{"file_name":"tests/ui/builtin-type-shadow.rs","byte_start":104,"byte_end":106,"line_start":5,"line_end":5,"column_start":5,"column_end":7,"is_primary":true,"text":[{"text":"    42","highlight_start":5,"highlight_end":7}],"label":"expected type parameter, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"tests/ui/builtin-type-shadow.rs","byte_start":94,"byte_end":97,"line_start":4,"line_end":4,"column_start":24,"column_end":27,"is_primary":false,"text":[{"text":"fn foo<u32>(a: u32) -> u32 {","highlight_start":24,"highlight_end":27}],"label":"expected `u32` because of return type","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `u32`\n   found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"type parameters must be constrained to match other types","code":null,"level":"help","spans":[],"children":[],"rendered":null},{"message":"for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"error[E0308]: mismatched types\n  --> tests/ui/builtin-type-shadow.rs:5:5\n   |\nLL | fn foo<u32>(a: u32) -> u32 {\n   |                        --- expected `u32` because of return type\nLL |     42\n   |     ^^ expected type parameter, found integer\n   |\n   = note: expected type `u32`\n              found type `{integer}`\n   = help: type parameters must be constrained to match other types\n   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters\n\n"}
2019-09-22T13:42:08.2166032Z {"message":"For more information about this error, try `rustc --explain E0308`.","code":null,"level":"failure-note","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0308`.\n"}
2019-09-22T13:42:08.2166191Z 
2019-09-22T13:42:08.2166491Z ------------------------------------------
2019-09-22T13:42:08.2166564Z 
---
2019-09-22T14:32:35.8484795Z Verifying status of rustfmt...
2019-09-22T14:32:35.8499929Z Verifying status of clippy-driver...
2019-09-22T14:32:35.8514873Z This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
2019-09-22T14:32:35.8525930Z 
2019-09-22T14:32:35.8526988Z ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
2019-09-22T14:32:35.8527438Z 
2019-09-22T14:32:35.8528665Z If you do intend to update 'clippy-driver', please check the error messages above and
2019-09-22T14:32:35.8528797Z commit another update.
2019-09-22T14:32:35.8528867Z 
2019-09-22T14:32:35.8529244Z If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
2019-09-22T14:32:35.8529618Z change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
2019-09-22T14:32:35.8529714Z proper steps.
2019-09-22T14:32:35.8547303Z   local time: Sun Sep 22 14:32:35 UTC 2019
2019-09-22T14:32:35.9370367Z   network time: Sun, 22 Sep 2019 14:32:35 GMT
2019-09-22T14:32:35.9370531Z == end clock drift check ==
2019-09-22T14:32:35.9370531Z == end clock drift check ==
2019-09-22T14:32:36.5337373Z ##[error]Bash exited with code '3'.
2019-09-22T14:32:36.5374953Z ##[section]Starting: Upload CPU usage statistics
2019-09-22T14:32:36.5382077Z ==============================================================================
2019-09-22T14:32:36.5382178Z Task         : Bash
2019-09-22T14:32:36.5382267Z Description  : Run a Bash script on macOS, Linux, or Windows

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 Sep 22, 2019
@tesuji
Copy link
Contributor Author

tesuji commented Sep 22, 2019

Included rust-lang/rust-clippy#4565 . Ping @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Sep 22, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Sep 22, 2019

📌 Commit d06de5d 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 Sep 22, 2019
@bors
Copy link
Contributor

bors commented Sep 22, 2019

⌛ Testing commit d06de5d with merge 1dd1884...

bors added a commit that referenced this pull request Sep 22, 2019
@bors
Copy link
Contributor

bors commented Sep 22, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 1dd1884 to master...

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

📣 Toolstate changed by #64604!

Tested on commit 1dd1884.
Direct link to PR: #64604

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 22, 2019
Tested on commit rust-lang/rust@1dd1884.
Direct link to PR: <rust-lang/rust#64604>

🎉 clippy-driver on windows: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
@tesuji tesuji deleted the clippyup branch September 22, 2019 23:53
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.

6 participants