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

Rename spanned HIR node enums from Foo_ to FooKind #52264

Merged
merged 11 commits into from
Jul 16, 2018
Merged

Conversation

csmoe
Copy link
Member

@csmoe csmoe commented Jul 11, 2018

Closes #51968
r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.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.
  InsecurePlatformWarning
  Downloading https://files.pythonhosted.org/packages/2d/99/b2c4e9d5a30f6471e410a146232b4118e697fa3ffc06d6a65efde84debd0/futures-3.2.0-py2-none-any.whl
Requirement already satisfied: six>=1.5 in /usr/lib/python2.7/dist-packages (from python-dateutil<3.0.0,>=2.1; python_version >= "2.7"->botocore==1.10.55->awscli)
Building wheels for collected packages: awscli
  Running setup.py bdist_wheel for awscli ... - \ | / - \ done
Successfully built awscli
Installing collected packages: docutils, jmespath, python-dateutil, botocore, colorama, pyasn1, rsa, futures, s3transfer, awscli
Successfully installed awscli-1.15.56 botocore-1.10.55 colorama-0.3.9 docutils-0.14 futures-3.2.0 jmespath-0.9.3 pyasn1-0.4.3 python-dateutil-2.7.3 rsa-3.4.2 s3transfer-0.1.13
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
---

[00:04:13] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:13] tidy error: /checkout/src/librustc_lint/types.rs:288: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_lint/unused.rs:105: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_lint/unused.rs:108: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_lint/unused.rs:114: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs:266: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs:290: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_mir/hair/cx/expr.rs:241: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_privacy/lib.rs:218: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_privacy/lib.rs:374: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/hir/intravisit.rs:522: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/hir/lowering.rs:3880: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/hir/lowering.rs:4060: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/hir/lowering.rs:4079: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/middle/resolve_lifetime.rs:678: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/middle/reachable.rs:286: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc/middle/liveness.rs:489: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/check/demand.rs:309: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/check/method/suggest.rs:392: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/check/writeback.rs:120: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/check/op.rs:366: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/check/op.rs:367: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/collect.rs:423: line longer than 100 chars
[00:04:13] tidy error: /checkout/src/librustc_typeck/collect.rs:843: line longer than 100 chars
[00:04:14] some tidy checks failed
[00:04:14] 
[00:04:14] 
[00:04:14] 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:04:14] 
[00:04:14] 
[00:04:14] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:14] Build completed unsuccessfully in 0:00:46
[00:04:14] Build completed unsuccessfully in 0:00:46
[00:04:14] Makefile:79: recipe for target 'tidy' failed
[00:04:14] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0edf34c4
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:25548aab:start=1531323977043156557,finish=1531323977049748557,duration=6592000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:18f46d36
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0218834a
$ 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 Jul 11, 2018

As mentioned on the issue, it would make me extremely happy if clippy were also fixed.

I'll look through the 1k changed lines tomorrow xD

Also you have some tidy failures

@csmoe
Copy link
Member Author

csmoe commented Jul 12, 2018

@oli-obk clean-up for clippy will be addressed as soon as this PR is landed.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 12, 2018

I was hoping to do a lockstep upgrade. If you do the cleanup, I'll take care of keeping this PR rebased and working and give it a priority so we get it through without breaking clippy at all on master

@csmoe csmoe force-pushed the kind branch 3 times, most recently from 9f8d890 to 7c64343 Compare July 12, 2018 07:38
@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 14, 2018

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

@oli-obk
Copy link
Contributor

oli-obk commented Jul 16, 2018

I pointed the clippy submodule directly at a branch in the clippy repository in order to make sure this PR doesn't break clippy. Additionally I snuk in a minor test output change (some backticks were added to error messages of rustc)

@bors r+ p=1

Superb cleanup and thanks for taking the time to also update clippy!

@bors
Copy link
Contributor

bors commented Jul 16, 2018

📌 Commit c692816 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 Jul 16, 2018
@bors
Copy link
Contributor

bors commented Jul 16, 2018

⌛ Testing commit c692816 with merge 50702b2...

bors added a commit that referenced this pull request Jul 16, 2018
Rename spanned HIR node enums from Foo_ to FooKind

Closes #51968
r? @oli-obk
@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:031111fe:start=1531753866831132131,finish=1531753866839590186,duration=8458055
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03396a27
$ 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 -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:321ee3f8
travis_time:start:321ee3f8
$ 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:0c9829e0
$ 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 Jul 16, 2018

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

@bors bors merged commit c692816 into rust-lang:master Jul 16, 2018
@bors bors mentioned this pull request Jul 16, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #52264!

Tested on commit 50702b2.
Direct link to PR: #52264

🎉 clippy-driver on windows: test-fail → test-pass.
🎉 clippy-driver on linux: test-fail → test-pass.

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.

4 participants