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

Readd some PartialEq and Hash derives used by Clippy #65690

Closed
wants to merge 2 commits into from

Conversation

flip1995
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 22, 2019
@Centril
Copy link
Contributor

Centril commented Oct 22, 2019

r=me rollup with similar comments re. Clippy added to the other places.

@flip1995 flip1995 force-pushed the readd_derives_clippy branch from 5b82c84 to 9f023a7 Compare October 22, 2019 09:26
@Centril
Copy link
Contributor

Centril commented Oct 22, 2019

Ah, you added a clippyup as well; @bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Oct 22, 2019

📌 Commit 9f023a71fedd3f6ad5a3e9402ca9093111777f69 has been approved by Centril

@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 Oct 22, 2019
@flip1995 flip1995 force-pushed the readd_derives_clippy branch from 9f023a7 to 729e40d Compare October 22, 2019 09:30
@flip1995
Copy link
Member Author

ping @Centril I had to readd the clippyup, since I forgot something in the Clippy PR

@Centril
Copy link
Contributor

Centril commented Oct 22, 2019

@bors r+ delegate=flip1995

@bors
Copy link
Contributor

bors commented Oct 22, 2019

📌 Commit 729e40da5df2bcb776c6df7b408ff983c97369f6 has been approved by Centril

@bors
Copy link
Contributor

bors commented Oct 22, 2019

✌️ @flip1995 can now approve this pull request

@rust-highfive
Copy link
Collaborator

The job LinuxTools 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-10-22T09:31:29.3298403Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-22T09:31:29.3486002Z ##[command]git config gc.auto 0
2019-10-22T09:31:29.3575120Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-22T09:31:29.3617153Z ##[command]git config --get-all http.proxy
2019-10-22T09:31:29.3758680Z ##[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/65690/merge:refs/remotes/pull/65690/merge
---
2019-10-22T11:18:41.2552372Z     Finished release [optimized] target(s) in 8m 43s
2019-10-22T11:20:59.3839306Z Error: there are broken links
2019-10-22T11:20:59.3841355Z  Caused By: "https://doc.rust-lang.org/nightly/nightly-rustc/syntax/parse/struct.ParseSess.html" returned 404 Not Found
2019-10-22T11:20:59.3842160Z  Caused By: "https://doc.rust-lang.org/nightly/nightly-rustc/syntax/parse/struct.ParseSess.html#method.buffer_lint" returned 404 Not Found
2019-10-22T11:20:59.3842954Z  Caused By: "***/tree/master/src/libsyntax/ext/tt" returned 404 Not Found
2019-10-22T11:20:59.3848368Z  Caused By: "https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ext/tt/macro_parser/fn.parse.html" returned 404 Not Found
2019-10-22T11:20:59.3853481Z  Caused By: "https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ext/tt/macro_rules/" returned 404 Not Found
2019-10-22T11:20:59.3855196Z  Caused By: "https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ext/tt/macro_parser/" returned 404 Not Found
2019-10-22T11:20:59.3855903Z  Caused By: "https://github.com/rust-lang/chalk/blob/master/src/test/wf.rs" returned 404 Not Found
---
2019-10-22T11:20:59.3891182Z  Caused By: "https://rust-lang.github.io/chalk/doc/chalk_parse/index.html" returned 404 Not Found
2019-10-22T11:20:59.3891810Z  Caused By: "https://rust-lang.github.io/chalk/doc/chalk/index.html" returned 404 Not Found
2019-10-22T11:20:59.3892360Z  Caused By: "https://rust-lang.github.io/chalk/doc/chalki/index.html" returned 404 Not Found
2019-10-22T11:20:59.3892960Z  Caused By: "https://doc.rust-lang.org/nightly/nightly-rustc/syntax/parse/struct.ParseSess.html" returned 404 Not Found
2019-10-22T11:20:59.3893231Z  Caused By: There was an error while fetching "http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.170.1097&rep=rep1&type=pdf", http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.170.1097&rep=rep1&type=pdf: timed out
2019-10-22T11:20:59.3893585Z  Caused By: "http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.704.1768" returned 500 Internal Server Error
2019-10-22T11:20:59.3900328Z 
2019-10-22T11:20:59.3901219Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/rustbook" "linkcheck" "/checkout/src/doc/rustc-guide"
2019-10-22T11:20:59.3901511Z expected success, got: exit code: 101
2019-10-22T11:20:59.3901664Z 
---
2019-10-22T11:27:45.9147040Z    Compiling clippy_lints v0.0.212 (/checkout/src/tools/clippy/clippy_lints)
2019-10-22T11:27:55.7767048Z error[E0507]: cannot move out of `self.s` which is behind a shared reference
2019-10-22T11:27:55.7767507Z    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:365:9
2019-10-22T11:27:55.7767834Z     |
2019-10-22T11:27:55.7768147Z 365 |         self.s.finish()
2019-10-22T11:27:55.7768984Z     |         ^^^^^^ move occurs because `self.s` has type `rustc_data_structures::stable_hasher::StableHasher`, which does not implement the `Copy` trait
2019-10-22T11:27:59.0366205Z error: aborting due to previous error
2019-10-22T11:27:59.0366316Z 
2019-10-22T11:27:59.0378204Z For more information about this error, try `rustc --explain E0507`.
2019-10-22T11:27:59.1641025Z error: could not compile `clippy_lints`.
2019-10-22T11:27:59.1641025Z error: could not compile `clippy_lints`.
2019-10-22T11:27:59.1656625Z warning: build failed, waiting for other jobs to finish...
2019-10-22T11:28:02.4851045Z error[E0507]: cannot move out of `self.s` which is behind a shared reference
2019-10-22T11:28:02.4852953Z    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:365:9
2019-10-22T11:28:02.4853642Z     |
2019-10-22T11:28:02.4854342Z 365 |         self.s.finish()
2019-10-22T11:28:02.4855208Z     |         ^^^^^^ move occurs because `self.s` has type `rustc_data_structures::stable_hasher::StableHasher`, which does not implement the `Copy` trait
2019-10-22T11:28:05.6683938Z error: aborting due to previous error
2019-10-22T11:28:05.6684967Z 
2019-10-22T11:28:05.6685729Z For more information about this error, try `rustc --explain E0507`.
2019-10-22T11:28:05.7975871Z error: could not compile `clippy_lints`.
---
2019-10-22T12:05:35.2648608Z Verifying status of rustfmt...
2019-10-22T12:05:35.2662969Z Verifying status of clippy-driver...
2019-10-22T12:05:35.2676979Z This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
2019-10-22T12:05:35.2700756Z 
2019-10-22T12:05:35.2702206Z ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
2019-10-22T12:05:35.2702655Z 
2019-10-22T12:05:35.2704297Z If you do intend to update 'clippy-driver', please check the error messages above and
2019-10-22T12:05:35.2704383Z commit another update.
2019-10-22T12:05:35.2704416Z 
2019-10-22T12:05:35.2704922Z If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
2019-10-22T12:05:35.2705165Z change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
2019-10-22T12:05:35.2705222Z proper steps.
2019-10-22T12:05:35.2730097Z   local time: Tue Oct 22 12:05:35 UTC 2019
2019-10-22T12:05:35.4343633Z   network time: Tue, 22 Oct 2019 12:05:35 GMT
2019-10-22T12:05:35.4343822Z == end clock drift check ==
2019-10-22T12:05:38.2894264Z 
2019-10-22T12:05:38.2894264Z 
2019-10-22T12:05:38.3003362Z ##[error]Bash exited with code '3'.
2019-10-22T12:05:38.3051874Z ##[section]Starting: Checkout
2019-10-22T12:05:38.3053864Z ==============================================================================
2019-10-22T12:05:38.3053917Z Task         : Get sources
2019-10-22T12:05:38.3053960Z 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)

@flip1995
Copy link
Member Author

flip1995 commented Oct 22, 2019

@bors r-

In a few minutes I'll have a rustc compiled from source of this PR locally. I will then be able to test the clippyup locally and reapprove this PR, once it is ready.

@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 Oct 22, 2019
@flip1995 flip1995 force-pushed the readd_derives_clippy branch from 729e40d to 67c8a0f Compare October 22, 2019 13:17
@flip1995
Copy link
Member Author

@bors r=Centril

./x.py test -i src/tools/clippy now passes for me locally.

@bors
Copy link
Contributor

bors commented Oct 22, 2019

📌 Commit 67c8a0f has been approved by Centril

@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 Oct 22, 2019
@bors
Copy link
Contributor

bors commented Oct 22, 2019

⌛ Testing commit 67c8a0f with merge 68cfd58...

bors added a commit that referenced this pull request Oct 22, 2019
Readd some PartialEq and Hash derives used by Clippy

cc #65647

r? @Centril cc @Manishearth
@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-10-22T17:58:21.8750390Z [RUSTC-TIMING] rustfix test:false 5.039
2019-10-22T17:58:22.1847560Z error[E0433]: failed to resolve: could not find `OutputFormat` in `test`
2019-10-22T17:58:22.1854678Z    --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:116:41
2019-10-22T17:58:22.1860440Z     |
2019-10-22T17:58:22.1866719Z 116 |         format: if config.quiet { test::OutputFormat::Terse } else { test::OutputFormat::Pretty },
2019-10-22T17:58:22.1873491Z     |                                         ^^^^^^^^^^^^ could not find `OutputFormat` in `test`
2019-10-22T17:58:22.1884953Z error[E0433]: failed to resolve: could not find `OutputFormat` in `test`
2019-10-22T17:58:22.1922327Z    --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:116:76
2019-10-22T17:58:22.1922989Z     |
2019-10-22T17:58:22.1922989Z     |
2019-10-22T17:58:22.1923923Z 116 |         format: if config.quiet { test::OutputFormat::Terse } else { test::OutputFormat::Pretty },
2019-10-22T17:58:22.1924462Z     |                                                                            ^^^^^^^^^^^^ could not find `OutputFormat` in `test`
2019-10-22T17:58:22.1931215Z error[E0425]: cannot find function `run_tests_console` in crate `test`
2019-10-22T17:58:22.1937704Z   --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:99:21
2019-10-22T17:58:22.2014606Z    |
2019-10-22T17:58:22.2014606Z    |
2019-10-22T17:58:22.2017981Z 99 |     let res = test::run_tests_console(&opts, tests.into_iter().collect());
2019-10-22T17:58:22.2019752Z 
2019-10-22T17:58:22.2021439Z error[E0603]: enum `ColorConfig` is private
2019-10-22T17:58:22.2022030Z   --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/common.rs:20:11
2019-10-22T17:58:22.2022550Z    |
2019-10-22T17:58:22.2022550Z    |
2019-10-22T17:58:22.2023166Z 20 | use test::ColorConfig;
2019-10-22T17:58:22.2023542Z    |           ^^^^^^^^^^^
2019-10-22T17:58:22.2023602Z 
2019-10-22T17:58:22.2023866Z error[E0603]: struct `TestOpts` is private
2019-10-22T17:58:22.2024199Z    --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:109:44
2019-10-22T17:58:22.2024458Z     |
2019-10-22T17:58:22.2024792Z 109 | pub fn test_opts(config: &Config) -> test::TestOpts {
2019-10-22T17:58:22.2025198Z 
2019-10-22T17:58:22.2025771Z error[E0603]: struct `TestOpts` is private
2019-10-22T17:58:22.2026110Z    --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:110:11
2019-10-22T17:58:22.2026358Z     |
2019-10-22T17:58:22.2026358Z     |
2019-10-22T17:58:22.2026651Z 110 |     test::TestOpts {
2019-10-22T17:58:22.2026933Z     |           ^^^^^^^^
2019-10-22T17:58:22.2027006Z 
2019-10-22T17:58:22.2027254Z error[E0603]: enum `RunIgnored` is private
2019-10-22T17:58:22.2027612Z    --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:115:52
2019-10-22T17:58:22.2027871Z     |
2019-10-22T17:58:22.2028743Z 115 |         run_ignored: if config.run_ignored { test::RunIgnored::Yes } else { test::RunIgnored::No },
2019-10-22T17:58:22.2029259Z 
2019-10-22T17:58:22.2029554Z error[E0603]: enum `RunIgnored` is private
2019-10-22T17:58:22.2029925Z    --> /cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/compiletest_rs-0.3.24/src/lib.rs:115:83
2019-10-22T17:58:22.2030231Z     |
2019-10-22T17:58:22.2030231Z     |
2019-10-22T17:58:22.2030652Z 115 |         run_ignored: if config.run_ignored { test::RunIgnored::Yes } else { test::RunIgnored::No },
2019-10-22T17:58:22.2031219Z 
2019-10-22T17:58:23.2771842Z error: aborting due to 8 previous errors
2019-10-22T17:58:23.2776024Z 
2019-10-22T17:58:23.2783343Z Some errors have detailed explanations: E0425, E0433, E0603.
---
2019-10-22T18:46:38.3023526Z Verifying status of rustfmt...
2019-10-22T18:46:38.3036788Z Verifying status of clippy-driver...
2019-10-22T18:46:38.3052000Z This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
2019-10-22T18:46:38.3063293Z 
2019-10-22T18:46:38.3064078Z ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
2019-10-22T18:46:38.3064313Z 
2019-10-22T18:46:38.3064974Z If you do intend to update 'clippy-driver', please check the error messages above and
2019-10-22T18:46:38.3065241Z commit another update.
2019-10-22T18:46:38.3065362Z 
2019-10-22T18:46:38.3066409Z If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
2019-10-22T18:46:38.3066926Z change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
2019-10-22T18:46:38.3067008Z proper steps.
2019-10-22T18:46:38.3092113Z   local time: Tue Oct 22 18:46:38 UTC 2019
2019-10-22T18:46:38.5968235Z   network time: Tue, 22 Oct 2019 18:46:38 GMT
2019-10-22T18:46:38.5968462Z == end clock drift check ==
2019-10-22T18:46:39.2132471Z 
2019-10-22T18:46:39.2132471Z 
2019-10-22T18:46:39.2247503Z ##[error]Bash exited with code '3'.
2019-10-22T18:46:39.2291083Z ##[section]Starting: Upload CPU usage statistics
2019-10-22T18:46:39.2303895Z ==============================================================================
2019-10-22T18:46:39.2304003Z Task         : Bash
2019-10-22T18:46:39.2304101Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-22T18:46:39.3876028Z Script contents:
2019-10-22T18:46:39.3876613Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$CI_JOB_NAME.csv
2019-10-22T18:46:39.3895206Z ========================== Starting Command Output ===========================
2019-10-22T18:46:39.3916405Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/8f9f2656-7cb7-43e0-a3f2-cec708f90d16.sh
2019-10-22T18:47:43.0098960Z upload failed: ./cpu-usage.csv to s3://rust-lang-ci2/rustc-builds/68cfd58d9bb322ecc1abaddbfe5c8589bca16329/cpu-x86_64-gnu-tools.csv Could not connect to the endpoint URL: "https://rust-lang-ci2.s3.amazonaws.com/rustc-builds/68cfd58d9bb322ecc1abaddbfe5c8589bca16329/cpu-x86_64-gnu-tools.csv"
2019-10-22T18:47:43.1041465Z 
2019-10-22T18:47:43.1077655Z ##[error]Bash exited with code '1'.
2019-10-22T18:47:43.1112378Z ##[section]Starting: Checkout
2019-10-22T18:47:43.1114126Z ==============================================================================
2019-10-22T18:47:43.1114228Z Task         : Get sources
2019-10-22T18:47:43.1114306Z 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)

@bors
Copy link
Contributor

bors commented Oct 22, 2019

💔 Test failed - checks-azure

@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 Oct 22, 2019
@tesuji tesuji mentioned this pull request Oct 23, 2019
@tesuji
Copy link
Contributor

tesuji commented Oct 23, 2019

I opened #65713 in the mean time.

bors added a commit that referenced this pull request Oct 23, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Oct 23, 2019
@flip1995
Copy link
Member Author

Thanks @lzutao !

@flip1995 flip1995 closed this Oct 23, 2019
@flip1995 flip1995 deleted the readd_derives_clippy branch October 23, 2019 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants