Rename spanned HIR node enums from Foo_ to FooKind #52264

csmoe · Jul 11, 2018

Closes #51968
r? @oli-obk

rust-highfive · Jul 11, 2018

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 · 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 · Jul 12, 2018

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

oli-obk · 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

rust-highfive · Jul 12, 2018

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.

[00:37:52]    Compiling rustdoc v0.0.0 (file:///checkout/src/librustdoc)
[00:37:52] error[E0433]: failed to resolve. Could not find `ItemKind` in `self`
[00:37:52]   --> librustdoc/clean/mod.rs:16:15
[00:37:52]    |
[00:37:52] 16 | pub use self::ItemKind::Enum::*;
[00:37:52]    |               ^^^^^^^^ Could not find `ItemKind` in `self`
[00:37:52] error[E0432]: unresolved import
[00:37:52]   --> librustdoc/clean/inline.rs:28:19
[00:37:52]    |
[00:37:52]    |
[00:37:52] 28 | use clean::{self, GetDefId, ToSource, get_auto_traits_with_def_id};
[00:37:52] 
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:364:16
[00:37:53]     |
[00:37:53]     |
[00:37:53] 364 |     pub inner: ItemKind::Enum,
[00:37:53]     |                ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:536:22
[00:37:53]     |
[00:37:53]     |
[00:37:53] 536 |     StrippedItem(Box<ItemKind::Enum>),
[00:37:53]     |                      ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:540:6
[00:37:53]     |
[00:37:53] 540 | impl ItemKind::Enum {
[00:37:53] 540 | impl ItemKind::Enum {
[00:37:53]     |      ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] 
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:543:13
[00:37:53]     |
[00:37:53] 543 |             ItemKind::Enum::StructItem(ref s) => &s.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:544:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 544 |             ItemKind::Enum::EnumItem(ref e) => &e.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:545:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 545 |             ItemKind::Enum::FunctionItem(ref f) => &f.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:546:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 546 |             ItemKind::Enum::TypedefItem(ref t, _) => &t.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:547:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 547 |             ItemKind::Enum::TraitItem(ref t) => &t.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:548:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 548 |             ItemKind::Enum::ImplItem(ref i) => &i.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:549:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 549 |             ItemKind::Enum::TyMethodItem(ref i) => &i.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:550:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 550 |             ItemKind::Enum::MethodItem(ref i) => &i.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]    --> librustdoc/clean/mod.rs:551:13
[00:37:53]     |
[00:37:53]     |
[00:37:53] 551 |             ItemKind::Enum::ForeignFunctionItem(ref f) => &f.generics,
[00:37:53]     |             ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] 
[00:37:53] error[E0408]: variable `TyInfer` is not bound in all patterns
[00:37:53]     --> librustdoc/clean/mod.rs:2990:23
[00:37:53]      |
[00:37:53] 2990 |             TyInfer | TyErr => Infer,
[00:37:53]      |             -------   ^^^^^ pattern doesn't bind `TyInfer`
[00:37:53]      |             variable not in all patterns
[00:37:53] 
[00:37:53] 
[00:37:53] error[E0408]: variable `TyErr` is not bound in all patterns
[00:37:53]     --> librustdoc/clean/mod.rs:2990:13
[00:37:53]      |
[00:37:53] 2990 |             TyInfer | TyErr => Infer,
[00:37:53]      |             ^^^^^^^   ----- variable not in all patterns
[00:37:53]      |             |
[00:37:53]      |             pattern doesn't bind `TyErr`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]   --> librustdoc/fold.rs:41:43
[00:37:53]    |
[00:37:53]    |
[00:37:53] 41 |     fn fold_inner_recur(&mut self, inner: ItemKind::Enum) -> ItemKind::Enum {
[00:37:53]    |                                           ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] error[E0433]: failed to resolve. Use of undeclared type or module `ItemKind`
[00:37:53]   --> librustdoc/fold.rs:41:62
[00:37:53]    |
[00:37:53]    |
[00:37:53] 41 |     fn fold_inner_recur(&mut self, inner: ItemKind::Enum) -> ItemKind::Enum {
[00:37:53]    |                                                              ^^^^^^^^ Use of undeclared type or module `ItemKind`
[00:37:53] 
[00:37:57] error[E0433]: failed to resolve. Could not find `ItemKind` in `clean`
[00:37:57]     --> librustdoc/html/render.rs:4178:16
[00:37:57]      |
[00:37:57] 4178 |         clean::ItemKind::Enum::ImplItem(ref i) => {
[00:37:57]      |                ^^^^^^^^ Could not find `ItemKind` in `clean`
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `TraitItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:54:20
[00:37:57]    |
[00:37:57] 54 |             clean::TraitItem(build_external_trait(cx, did))
[00:37:57]    |                    ^^^^^^^^^ not found in `clean`
[00:37:57]    |
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::TraitItem;
[00:37:57]    |
[00:37:57] 13 | use rustc::hir::print::Nested::TraitItem;
[00:37:57]    |
[00:37:57] 13 | use syntax::ext::base::Annotatable::TraitItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `FunctionItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:58:20
[00:37:57]    |
[00:37:57] 58 |             clean::FunctionItem(build_external_function(cx, did))
[00:37:57]    |                    ^^^^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::FunctionItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `StructItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:63:20
[00:37:57]    |
[00:37:57] 63 |             clean::StructItem(build_struct(cx, did))
[00:37:57]    |                    ^^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::StructItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `UnionItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:68:20
[00:37:57]    |
[00:37:57] 68 |             clean::UnionItem(build_union(cx, did))
[00:37:57]    |                    ^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::UnionItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `TypedefItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:73:20
[00:37:57]    |
[00:37:57] 73 |             clean::TypedefItem(build_type_alias(cx, did), false)
[00:37:57]    |                    ^^^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::TypedefItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `EnumItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:78:20
[00:37:57]    |
[00:37:57] 78 |             clean::EnumItem(build_enum(cx, did))
[00:37:57]    |                    ^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::EnumItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find value `ForeignTypeItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:83:20
[00:37:57] 83 |             clean::ForeignTypeItem
[00:37:57]    |                    ^^^^^^^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::ForeignTypeItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `ModuleItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:93:20
[00:37:57]    |
[00:37:57] 93 |             clean::ModuleItem(build_module(cx, did, visited))
[00:37:57]    |                    ^^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::ModuleItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `StaticItem` in module `clean`
[00:37:57]   --> librustdoc/clean/inline.rs:97:20
[00:37:57]    |
[00:37:57] 97 |             clean::StaticItem(build_static(cx, did, mtbl))
[00:37:57]    |                    ^^^^^^^^^^ not found in `clean`
[00:37:57]    |
[00:37:57]    |
[00:37:57] 13 | use clean::ItemEnum::StaticItem;
[00:37:57]    |
[00:37:57] 13 | use rustc::middle::mem_categorization::Categorization::StaticItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `ConstantItem` in module `clean`
[00:37:57]    --> librustdoc/clean/inline.rs:101:20
[00:37:57]     |
[00:37:57] 101 |             clean::ConstantItem(build_const(cx, did))
[00:37:57]     |                    ^^^^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57] 13  | use clean::ItemEnum::ConstantItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `MacroItem` in module `clean`
[00:37:57]    --> librustdoc/clean/inline.rs:107:20
[00:37:57]     |
[00:37:57] 107 |             clean::MacroItem(build_macro(cx, did, name))
[00:37:57]     |                    ^^^^^^^^^ not found in `clean`
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57] 13  | use clean::ItemEnum::MacroItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `ImplItem` in module `clean`
[00:37:57]    --> librustdoc/clean/inline.rs:405:23
[00:37:57]     |
[00:37:57] 405 |         inner: clean::ImplItem(clean::Impl {
[00:37:57]     |                       ^^^^^^^^ not found in `clean`
[00:37:57]     |
[00:37:57]     |
[00:37:57] 13  | use clean::ItemEnum::ImplItem;
[00:37:57]     |
[00:37:57] 13  | use rustc::hir::print::Nested::ImplItem;
[00:37:57]     |
[00:37:57] 13  | use syntax::ext::base::Annotatable::ImplItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `ImplItem` in this scope
[00:37:57]    --> librustdoc/clean/auto_trait.rs:232:24
[00:37:57]     |
[00:37:57] 232 |                 inner: ImplItem(Impl {
[00:37:57] help: possible candidates are found in other modules, you can import them into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 11  | use clean::ItemEnum::ImplItem;
[00:37:57]     |
[00:37:57] 11  | use rustc::hir::print::Nested::ImplItem;
[00:37:57]     |
[00:37:57] 11  | use syntax::ext::base::Annotatable::ImplItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `ModuleItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:171:13
[00:37:57] 171 |             ModuleItem(ref module) => {
[00:37:57]     |             ^^^^^^^^^^ not found in this scope
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::ModuleItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `ModuleItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:184:17
[00:37:57]     |
[00:37:57] 184 |                 ModuleItem(ref mut m) => m,
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::ModuleItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `PrimitiveItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:196:28
[00:37:57]     |
[00:37:57] 196 |                     inner: PrimitiveItem(prim),
[00:37:57]     |                            ^^^^^^^^^^^^^ did you mean `Primitive`?
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::PrimitiveItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `KeywordItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:208:28
[00:37:57]     |
[00:37:57] 208 |                     inner: KeywordItem(kw),
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::KeywordItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `StrippedItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:409:13
[00:37:57]     |
[00:37:57] 409 |             StrippedItem(box ModuleItem(Module { is_crate: true, ..})) |
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::StrippedItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `ModuleItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:409:30
[00:37:57]     |
[00:37:57] 409 |             StrippedItem(box ModuleItem(Module { is_crate: true, ..})) |
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::ModuleItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `ModuleItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:410:13
[00:37:57]     |
[00:37:57] 410 |             ModuleItem(Module { is_crate: true, ..}) => true,
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::ModuleItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `StrippedItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:461:28
[00:37:57]     |
[00:37:57] 461 |         match self.inner { StrippedItem(..) => true, _ => false }
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::StrippedItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `StructItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:465:13
[00:37:57]     |
[00:37:57] 465 |             StructItem(ref _struct) => Some(_struct.fields_stripped),
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::StructItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `UnionItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:466:13
[00:37:57]     |
[00:37:57] 466 |             UnionItem(ref union) => Some(union.fields_stripped),
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::UnionItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0531]: cannot find tuple struct/variant `VariantItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:467:13
[00:37:57]     |
[00:37:57] 467 |             VariantItem(Variant { kind: VariantKind::Struct(ref vstruct)} ) => {
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::VariantItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `ModuleItem` in this scope
[00:37:57]    --> librustdoc/clean/mod.rs:629:20
[00:37:57]     |
[00:37:57] 629 |             inner: ModuleItem(Module {
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]     |
[00:37:57]     |
[00:37:57] 14  | use clean::ItemEnum::ModuleItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `FunctionItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2121:20
[00:37:57]      |
[00:37:57] 2121 |             inner: FunctionItem(Function {
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::FunctionItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `TraitItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2301:20
[00:37:57]      |
[00:37:57] 2301 |             inner: TraitItem(Trait {
[00:37:57] help: possible candidates are found in other modules, you can import them into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::TraitItem;
[00:37:57]      |
[00:37:57] 14   | use rustc::hir::print::Nested::TraitItem;
[00:37:57]      |
[00:37:57] 14   | use syntax::ext::base::Annotatable::TraitItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `AssociatedConstItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2342:17
[00:37:57]      |
[00:37:57] 2342 |                 AssociatedConstItem(ty.clean(cx),
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::AssociatedConstItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `MethodItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2346:17
[00:37:57]      |
[00:37:57] 2346 |                 MethodItem((sig, &self.generics, body).clean(cx))
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::MethodItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `TyMethodItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2352:17
[00:37:57]      |
[00:37:57] 2352 |                 TyMethodItem(TyMethod {
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::TyMethodItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `AssociatedTypeItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2359:17
[00:37:57]      |
[00:37:57] 2359 |                 AssociatedTypeItem(bounds.clean(cx), default.clean(cx))
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::AssociatedTypeItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `AssociatedConstItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2379:17
[00:37:57]      |
[00:37:57] 2379 |                 AssociatedConstItem(ty.clean(cx),
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::AssociatedConstItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `MethodItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2383:17
[00:37:57]      |
[00:37:57] 2383 |                 MethodItem((sig, &self.generics, body).clean(cx))
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::MethodItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `TypedefItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2385:48
[00:37:57]      |
[00:37:57] 2385 |             hir::ImplItemKind::Type(ref ty) => TypedefItem(Typedef {
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::TypedefItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `AssociatedConstItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2413:17
[00:37:57]      |
[00:37:57] 2413 |                 AssociatedConstItem(ty.clean(cx), default)
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::AssociatedConstItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `MethodItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2453:21
[00:37:57]      |
[00:37:57] 2453 |                     MethodItem(Method {
[00:37:57] help: possible candidate is found in another module, you can import it into scope
[00:37:57]      |
[00:37:57]      |
[00:37:57] 14   | use clean::ItemEnum::MethodItem;
[00:37:57] 
[00:37:57] 
[00:37:57] error[E0425]: cannot find function `TyMethodItem` in this scope
[00:37:57]     --> librustdoc/clean/mod.rs:2464:21
[00:37:57]      |

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 · Jul 14, 2018

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

oli-obk · 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 · Jul 16, 2018

📌 Commit c692816 has been approved by oli-obk

bors · Jul 16, 2018

⌛️ Testing commit c692816 with merge 50702b2...

rust-highfive · Jul 16, 2018

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 · Jul 16, 2018

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

rust-highfive · Jul 16, 2018

📣 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.

rust-highfive assigned oli-obk Jul 11, 2018

rust-highfive added the S-waiting-on-review label Jul 11, 2018

csmoe force-pushed the csmoe:kind branch 3 times, most recently from 9f8d890 to 7c64343 Jul 12, 2018

csmoe force-pushed the csmoe:kind branch from 7c64343 to 12e2691 Jul 12, 2018

csmoe referenced this pull request Jul 12, 2018
Closed
Rename spanned HIR node enums from Foo_ to FooKind #2913

oli-obk force-pushed the csmoe:kind branch from 12e2691 to c692816 Jul 16, 2018

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jul 16, 2018

bors added a commit that referenced this pull request Jul 16, 2018

Auto merge of #52264 - csmoe:kind, r=oli-obk
Rename spanned HIR node enums from Foo_ to FooKind Closes #51968 r? @oli-obk

Loading status checks…

50702b2

bors merged commit c692816 into rust-lang:master Jul 16, 2018
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

homu Test successful
Details

bors referenced this pull request Jul 16, 2018
Closed
Better typeck divergence #50262

kennytm referenced this pull request Jul 16, 2018
Merged
update miri #52338

csmoe deleted the csmoe:kind branch Jul 20, 2018

rust-lang/rust

Join GitHub today

Rename spanned HIR node enums from Foo_ to FooKind #52264

Conversation

csmoe commented Jul 11, 2018

rust-highfive assigned oli-obk Jul 11, 2018

rust-highfive added the S-waiting-on-review label Jul 11, 2018

This comment has been minimized.

rust-highfive commented Jul 11, 2018

This comment has been minimized.

oli-obk commented Jul 11, 2018

This comment has been minimized.

csmoe commented Jul 12, 2018

This comment has been minimized.

oli-obk commented Jul 12, 2018

csmoe force-pushed the csmoe:kind branch 3 times, most recently from 9f8d890 to 7c64343 Jul 12, 2018

This comment was marked as resolved.

rust-highfive commented Jul 12, 2018

csmoe force-pushed the csmoe:kind branch from 7c64343 to 12e2691 Jul 12, 2018

csmoe referenced this pull request Jul 12, 2018

This comment has been minimized.

bors commented Jul 14, 2018

csmoe and others added some commits Jul 11, 2018

oli-obk force-pushed the csmoe:kind branch from 12e2691 to c692816 Jul 16, 2018

This comment has been minimized.

oli-obk commented Jul 16, 2018

This comment has been minimized.

bors commented Jul 16, 2018

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jul 16, 2018

This comment has been minimized.

bors commented Jul 16, 2018

bors added a commit that referenced this pull request Jul 16, 2018

This comment has been minimized.

rust-highfive commented Jul 16, 2018

This comment has been minimized.

bors commented Jul 16, 2018

Hide details View details bors merged commit c692816 into rust-lang:master Jul 16, 2018 1 of 2 checks passed

1 of 2 checks passed

bors referenced this pull request Jul 16, 2018

This comment has been minimized.

rust-highfive commented Jul 16, 2018

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 16, 2018

This was referenced Jul 16, 2018

kennytm referenced this pull request Jul 16, 2018

csmoe deleted the csmoe:kind branch Jul 20, 2018

csmoe force-pushed the csmoe:kind branch 3 times, most recently from `9f8d890` to `7c64343` Jul 12, 2018

csmoe force-pushed the csmoe:kind branch from `7c64343` to `12e2691` Jul 12, 2018

oli-obk force-pushed the csmoe:kind branch from `12e2691` to `c692816` Jul 16, 2018

bors merged commit `c692816` into rust-lang:master Jul 16, 2018
1 of 2 checks passed