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

submodules: update clippy and rls #57303

Merged
merged 3 commits into from
Jan 7, 2019

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jan 3, 2019

Fixes clippy toolstate

Changes:

Update to latest compiletest-rs release
add testcase for #3462
deps: bump rustc_tools_util version from 0.1.0 to 0.1.1 just in case...
rustc_tool_utils: fix failure to create proper non-repo version string when used in crates on crates.io, bump version
UI test cleanup: Extract ifs_same_cond tests
UI test cleanup: Extract for_kv_map lint tests
Fix test for rust-lang/rust#57250
Limit infinite_iter collect() check to known types
Some improvements to util documentation
Use hashset for name blacklist
Reformat random_state tests
Use node_id_to_type_opt instead of node_it_to_type in random_state
Check pattern equality while checking declaration equality
random_state lint
Use an FxHashSet for valid idents in documentation lint
Fix suggestion for unnecessary_ref lint
Update CONTRIBUTING.md for rustfix tests
Update .fixed files via update-references.sh
Run rustfix on first UI test
Use WIP branch for compiletest_rs

Also updates RLS and removes the patching of rustc_tool_utils from cargo.toml

RLS changes:

update clippy hash and rustc_tools_util and use rustc_tools_util from crates.io
Work around https://github.com/rust-lang/rust/pull/55937
Update Clippy... again
Update Clippy
Update clippy

r? @oli-obk

@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 Jan 3, 2019
Cargo.lock Outdated Show resolved Hide resolved
@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:1382f5f8:start=1546526062986574057,finish=1546526064103103118,duration=1116529061
$ 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
---
tidy check
[00:03:30] * 568 error codes
[00:03:30] * highest error code: E0721
[00:03:31] * 245 features
[00:03:31] invalid source: "git+https://github.com/rust-lang/rust-clippy?rev=a3c77f6ad1c1c185e561e9cd7fdec7db569169d1#a3c77f6ad1c1c185e561e9cd7fdec7db569169d1"
[00:03:31] some tidy checks failed
[00:03:31] 
[00:03:31] 
[00:03:31] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:31] 
[00:03:31] 
[00:03:31] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:31] Build completed unsuccessfully in 0:00:45
[00:03:31] Build completed unsuccessfully in 0:00:45
[00:03:31] Makefile:69: recipe for target 'tidy' failed
[00:03:31] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1cb5dc30
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Jan  3 14:38:05 UTC 2019
---
travis_time:end:12986fc4:start=1546526285488969273,finish=1546526285494029756,duration=5060483
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0c0f7c68
$ 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:1ecc4029
travis_time:start:1ecc4029
$ 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:02226ca2
$ 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 matthiaskrgr changed the title submodules: update clippy from 39bd8449 to baec524f submodules: update clippy and rls Jan 3, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jan 3, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jan 3, 2019

📌 Commit 77caf1ff14954545ca049a3a20d21ec54e3f80a0 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 3, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools 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:069f5dcf:start=1546535304381827813,finish=1546535305520713361,duration=1138885548
$ 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-tools
---
[01:21:38] 
[01:21:38] ------------------------------------------
[01:21:38] stderr:
[01:21:38] ------------------------------------------
[01:21:38] {"message":"src/librustc/ty/context.rs:248: node type MacroAttributesTest (id=43) with HirId::owner DefId(0/0:9 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0]::{{impl}}[0]) cannot be placed in TypeckTables with local_id_root DefId(0/0:6 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0])","code":null,"level":"error: internal compiler error","spans":[],"children":[],"rendered":"error: internal compiler error: src/librustc/ty/context.rs:248: node type MacroAttributesTest (id=43) with HirId::owner DefId(0/0:9 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0]::{{impl}}[0]) cannot be placed in TypeckTables with local_id_root DefId(0/0:6 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0])\n\n"}
[01:21:38] thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:590:9
[01:21:38] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:21:38] {"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
[01:21:38] note: the compiler unexpectedly panicked. this is a bug.
[01:21:38] 
[01:21:38] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:21:38] 
---
[01:29:47]     |
[01:29:47] 151 |                 .position(|line| line.trim_right().ends_with("*/"))
[01:29:47]     |                                       ^^^^^^^^^^
[01:29:47] 
[01:31:20] warning[E0597]: `msg.method` does not live long enough
[01:31:20]     |
[01:31:20] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:31:20] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:31:20]     |                     -------------------------------------- type annotation requires that `msg.method` is borrowed for `'static`
[01:31:20] 260 |             msg.method;
[01:31:20] 260 |             msg.method;
[01:31:20]     |             ^^^^^^^^^^ borrowed value does not live long enough
[01:31:20] 290 |     }
[01:31:20] 290 |     }
[01:31:20]     |     - `msg.method` dropped here while still borrowed
[01:31:20]     = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
[01:31:20]     = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
[01:31:20] 
[01:33:33]     Finished release [optimized] target(s) in 11m 55s
[01:33:33]     Finished release [optimized] target(s) in 11m 55s
[01:33:33] travis_fold:end:stage2-rls

[01:33:33] travis_time:end:stage2-rls:start=1546540211966991711,finish=1546540927693574348,duration=715726582637

[01:33:34]    Compiling difference v2.0.0
[01:33:35]    Compiling rls v1.31.6 (/checkout/src/tools/rls)
[01:33:46] warning[E0597]: `msg.method` does not live long enough
[01:33:46]     |
[01:33:46] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:33:46] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:33:46]     |                     -------------------------------------- type annotation requires that `msg.method` is borrowed for `'static`
[01:33:46] 260 |             msg.method;
[01:33:46] 260 |             msg.method;
[01:33:46]     |             ^^^^^^^^^^ borrowed value does not live long enough
[01:33:46] 290 |     }
[01:33:46] 290 |     }
[01:33:46]     |     - `msg.method` dropped here while still borrowed
[01:33:46]     = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
[01:33:46]     = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
[01:33:46] 
[01:36:06]     Finished release [optimized] target(s) in 2m 32s
---
[01:44:45] Verifying status of rustfmt...
[01:44:45] Verifying status of clippy-driver...
[01:44:45] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:44:45] 
[01:44:45] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:44:45] 
[01:44:45] If you do intend to update 'clippy-driver', please check the error messages above and
[01:44:45] commit another update.
[01:44:45] 
[01:44:45] If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
[01:44:45] change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
[01:44:45] proper steps.
4482940 ./obj
4482900 ./obj/build
3823040 ./obj/build/x86_64-unknown-linux-gnu
1337124 ./obj/build/x86_64-unknown-linux-gnu/llvm

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

That's strange, I can't reproduce the test failure locally inside the rustc repo.

https://travis-ci.org/rust-lang/rust/jobs/474944539#L6983

@bors
Copy link
Contributor

bors commented Jan 3, 2019

⌛ Testing commit 77caf1ff14954545ca049a3a20d21ec54e3f80a0 with merge 73fd48bbe82c6d55d5daa21388d46f78dd6ce262...

@bors
Copy link
Contributor

bors commented Jan 3, 2019

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple-alt 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:02:24]       Memory: 8 GB
[00:02:24]       Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:02:24]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:02:24]       SMC Version (system): 2.8f0
[00:02:24]       Serial Number (system): VMYTdpfubrqj
[00:02:24] 
[00:02:24] hw.ncpu: 4
[00:02:24] hw.byteorder: 1234
[00:02:24] hw.memsize: 8589934592
---
Building stage2 tool cargo (x86_64-apple-darwin)
[00:56:25]  Downloading crates ...
[00:56:25] warning: spurious network error (2 tries remaining): [6] Couldn't resolve host name (Could not resolve host: crates.io)
[00:56:25] warning: spurious network error (1 tries remaining): [6] Couldn't resolve host name (Could not resolve host: crates.io)
[00:56:25] error: failed to download from `https://crates.io/api/v1/crates/openssl-src/111.1.0+1.1.1a/download`
[00:56:25] Caused by:
[00:56:25]   [6] Couldn't resolve host name (Could not resolve host: crates.io)
[00:56:25] command did not execute successfully: "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage0/bin/cargo" "build" "--target" "x86_64-apple-darwin" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/Users/travis/build/rust-lang/rust/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static" "--message-format" "json"
[00:56:25] expected success, got: exit code: 101
[00:56:25] expected success, got: exit code: 101
[00:56:25] failed to run: /Users/travis/build/rust-lang/rust/build/bootstrap/debug/bootstrap build
[00:56:25] Build completed unsuccessfully in 0:52:56
[00:56:25] make: *** [all] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:255249c1
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Jan  3 21:44:20 GMT 2019
---
travis_fold:start:after_failure.2
travis_time:start:041569f6
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
total 0
drwx------+ 15 travis  staff  510 Jan 25  2018 ..
drwx------   2 travis  staff   68 Dec  6  2017 .
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:0823a2f8
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
travis_time:end:0823a2f8:start=1546551869173263000,finish=1546551869192011000,duration=18748000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0d8220f2
$ 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:1462dcac
travis_time:start:1462dcac
$ 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:00f51d2c
$ dmesg | grep -i kill
$ dmesg | grep -i kill
Unable to obtain kernel buffer: Operation not permitted
usage: sudo dmesg
travis_fold:end:after_failure.6

Done. Your build exited with 1.

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 Jan 3, 2019
@matthiaskrgr
Copy link
Member Author

I updated to latest clippy HEAD now.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools 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:1b0a1dc2:start=1546564889746272671,finish=1546564890831991361,duration=1085718690
$ 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-tools
---
[01:23:26] 
[01:23:26] ------------------------------------------
[01:23:26] stderr:
[01:23:26] ------------------------------------------
[01:23:26] {"message":"src/librustc/ty/context.rs:248: node type MacroAttributesTest (id=43) with HirId::owner DefId(0/0:9 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0]::{{impl}}[0]) cannot be placed in TypeckTables with local_id_root DefId(0/0:6 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0])","code":null,"level":"error: internal compiler error","spans":[],"children":[],"rendered":"error: internal compiler error: src/librustc/ty/context.rs:248: node type MacroAttributesTest (id=43) with HirId::owner DefId(0/0:9 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0]::{{impl}}[0]) cannot be placed in TypeckTables with local_id_root DefId(0/0:6 ~ used_underscore_binding_macro[317d]::_IMPL_DESERIALIZE_FOR_MacroAttributesTest[0])\n\n"}
[01:23:26] thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:590:9
[01:23:26] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:23:26] {"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
[01:23:26] note: the compiler unexpectedly panicked. this is a bug.
[01:23:26] 
[01:23:26] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:23:26] 
---
[01:31:36]     |
[01:31:36] 151 |                 .position(|line| line.trim_right().ends_with("*/"))
[01:31:36]     |                                       ^^^^^^^^^^
[01:31:36] 
[01:33:11] warning[E0597]: `msg.method` does not live long enough
[01:33:11]     |
[01:33:11] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:33:11] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:33:11]     |                     -------------------------------------- type annotation requires that `msg.method` is borrowed for `'static`
[01:33:11] 260 |             msg.method;
[01:33:11] 260 |             msg.method;
[01:33:11]     |             ^^^^^^^^^^ borrowed value does not live long enough
[01:33:11] 290 |     }
[01:33:11] 290 |     }
[01:33:11]     |     - `msg.method` dropped here while still borrowed
[01:33:11]     = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
[01:33:11]     = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
[01:33:11] 
[01:35:24]     Finished release [optimized] target(s) in 11m 57s
[01:35:24]     Finished release [optimized] target(s) in 11m 57s
[01:35:24] travis_fold:end:stage2-rls

[01:35:24] travis_time:end:stage2-rls:start=1546569906365279507,finish=1546570623924231275,duration=717558951768

[01:35:24]    Compiling difference v2.0.0
[01:35:25]    Compiling rls v1.31.6 (/checkout/src/tools/rls)
[01:35:36] warning[E0597]: `msg.method` does not live long enough
[01:35:36]     |
[01:35:36] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:35:36] 185 |                     <$n_action as LSPNotification>::METHOD => {
[01:35:36]     |                     -------------------------------------- type annotation requires that `msg.method` is borrowed for `'static`
[01:35:36] 260 |             msg.method;
[01:35:36] 260 |             msg.method;
[01:35:36]     |             ^^^^^^^^^^ borrowed value does not live long enough
[01:35:36] 290 |     }
[01:35:36] 290 |     }
[01:35:36]     |     - `msg.method` dropped here while still borrowed
[01:35:36]     = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
[01:35:36]     = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
[01:35:36] 
[01:37:53]     Finished release [optimized] target(s) in 2m 29s

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

I believe this is blocked on #57304 which will fix the rls build warning..?

@mati865
Copy link
Contributor

mati865 commented Jan 4, 2019

I'm not sure if rls warning matters here because the panic happens inside clippy tests.

@matthiaskrgr
Copy link
Member Author

It seems like this should also trigger a -tools job on travis but it doesn't for some reason.

@mati865
Copy link
Contributor

mati865 commented Jan 4, 2019

Maybe last commit message must be like update {clippy, rls}: https://github.com/rust-lang/rust/blob/master/.travis.yml#L180

@matthiaskrgr
Copy link
Member Author

Dammit.... :(
Well, there's nothing I can do about it, I don't have a windows machine.

@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 6, 2019
@matthiaskrgr
Copy link
Member Author

I added a reversion of #57101

@codeworm96 codeworm96 mentioned this pull request Jan 7, 2019
@bors
Copy link
Contributor

bors commented Jan 7, 2019

☔ The latest upstream changes (presumably #57327) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor

oli-obk commented Jan 7, 2019

@bors delegate

you can now send it off via bors yourself without having to wait for someone to r+ apparently that did not work :/

r=me after a rebase

@flip1995
Copy link
Member

flip1995 commented Jan 7, 2019

@oli-obk

@bors delegate+ or @bors delegate=matthiaskrgr

@bors
Copy link
Contributor

bors commented Jan 7, 2019

@flip1995: 🔑 Insufficient privileges: Not in reviewers

1 similar comment
@bors
Copy link
Contributor

bors commented Jan 7, 2019

@flip1995: 🔑 Insufficient privileges: Not in reviewers

@oli-obk
Copy link
Contributor

oli-obk commented Jan 7, 2019

@bors delegate+

@bors
Copy link
Contributor

bors commented Jan 7, 2019

✌️ @matthiaskrgr can now approve this pull request

Changes:
````
Revert "tests: used_underscore_binding_macro: disable random_state lint."
Revert "Auto merge of rust-lang#3603 - xfix:random-state-lint, r=phansch"
rustup rust-lang#56837
rustup (don't know the exact PR unfortunately)
Add itertools to integration tests
tests: used_underscore_binding_macro: disable random_state lint.
Trigger `use_self` lint in local macros
Add run-rustfix where it already passes
rustup: rust-lang#55517
Make clippy work with parallel rustc
Add ui/for_kv_map test for false positive in rust-lang#1279
Update to latest compiletest-rs release
add testcase for rust-lang#3462
deps: bump rustc_tools_util version from 0.1.0 to 0.1.1 just in case...
Use compiletest's aux-build header instead of include macro
rustc_tool_utils: fix failure to create proper non-repo version string when used in crates on crates.io, bump version
rustfmt
UI test cleanup: Extract ifs_same_cond tests
Extract IteratorFalsePositives into option_helpers.rs
UI test cleanup: Extract for_kv_map lint tests
UI test cleanup: Extract lint from methods.rs test
Fix test for rust-lang#57250
Limit infinite_iter collect() check to known types
Some improvements to util documentation
Use hashset for name blacklist
Reformat random_state tests
Use node_id_to_type_opt instead of node_it_to_type in random_state
Check pattern equality while checking declaration equality
random_state lint
Move constant write checks to temporary_assignment lint
Use an FxHashSet for valid idents in documentation lint
Fix suggestion for unnecessary_ref lint
Update CONTRIBUTING.md for rustfix tests
Update .fixed files via update-references.sh
Run rustfix on first UI test
Use WIP branch for compiletest_rs
````
Changes:
````
Update Clippy
Move TestFailures when collecting failures
Update languageserver-types to 0.51.1
update clippy hash and rustc_tools_util and use rustc_tools_util from crates.io
Work around rust-lang#55937
Update Clippy... again
Update Clippy
Update clippy
````
This reverts commit 6861426, reversing
changes made to cae623c.

Should fix tools on windows.

Reopens rust-lang#57014
@matthiaskrgr
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jan 7, 2019

📌 Commit c5101b6 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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jan 7, 2019
@bors
Copy link
Contributor

bors commented Jan 7, 2019

⌛ Testing commit c5101b6 with merge 8e2063d...

bors added a commit that referenced this pull request Jan 7, 2019
submodules: update clippy and rls

Fixes clippy toolstate

Changes:
````
Update to latest compiletest-rs release
add testcase for #3462
deps: bump rustc_tools_util version from 0.1.0 to 0.1.1 just in case...
rustc_tool_utils: fix failure to create proper non-repo version string when used in crates on crates.io, bump version
UI test cleanup: Extract ifs_same_cond tests
UI test cleanup: Extract for_kv_map lint tests
Fix test for #57250
Limit infinite_iter collect() check to known types
Some improvements to util documentation
Use hashset for name blacklist
Reformat random_state tests
Use node_id_to_type_opt instead of node_it_to_type in random_state
Check pattern equality while checking declaration equality
random_state lint
Use an FxHashSet for valid idents in documentation lint
Fix suggestion for unnecessary_ref lint
Update CONTRIBUTING.md for rustfix tests
Update .fixed files via update-references.sh
Run rustfix on first UI test
Use WIP branch for compiletest_rs
````

Also updates RLS and removes the patching of rustc_tool_utils from cargo.toml

RLS changes:
````
update clippy hash and rustc_tools_util and use rustc_tools_util from crates.io
Work around #55937
Update Clippy... again
Update Clippy
Update clippy
````
r? @oli-obk
@bors
Copy link
Contributor

bors commented Jan 7, 2019

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 8e2063d to master...

@bors bors merged commit c5101b6 into rust-lang:master Jan 7, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #57303!

Tested on commit 8e2063d.
Direct link to PR: #57303

🎉 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).
🎉 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 added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 7, 2019
Tested on commit rust-lang/rust@8e2063d.
Direct link to PR: <rust-lang/rust#57303>

🎉 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).
🎉 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).
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.

7 participants