Skip to content

Rename TyS.sty to TyS.kind#64513

Merged
bors merged 5 commits intorust-lang:masterfrom
varkor:sty-begone
Sep 26, 2019
Merged

Rename TyS.sty to TyS.kind#64513
bors merged 5 commits intorust-lang:masterfrom
varkor:sty-begone

Conversation

@varkor
Copy link
Contributor

@varkor varkor commented Sep 16, 2019

Fixes #64353.

r? @eddyb

@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 16, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-09-16T18:15:49.0042279Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-16T18:15:49.0226754Z ##[command]git config gc.auto 0
2019-09-16T18:15:49.0305490Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-16T18:15:49.0359635Z ##[command]git config --get-all http.proxy
2019-09-16T18:15:49.0494407Z ##[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/64513/merge:refs/remotes/pull/64513/merge
---
2019-09-16T19:17:59.0129312Z .................................................................................................... 1500/9020
2019-09-16T19:18:04.9648910Z .................................................................................................... 1600/9020
2019-09-16T19:18:17.4539716Z .............................................................i...............i...................... 1700/9020
2019-09-16T19:18:24.5293139Z .................................................................................................... 1800/9020
2019-09-16T19:18:39.6852934Z ....................................................iiiii........................................... 1900/9020
2019-09-16T19:18:50.7060588Z .................................................................................................... 2100/9020
2019-09-16T19:18:53.2378943Z .................................................................................................... 2200/9020
2019-09-16T19:18:56.6789870Z .................................................................................................... 2300/9020
2019-09-16T19:19:05.1392966Z .................................................................................................... 2400/9020
---
2019-09-16T19:22:04.6905834Z ........................................i...............i........................................... 4700/9020
2019-09-16T19:22:15.6533670Z .................................................................................................... 4800/9020
2019-09-16T19:22:22.0977568Z .................................................................................................... 4900/9020
2019-09-16T19:22:31.6246523Z .................................................................................................... 5000/9020
2019-09-16T19:22:38.8744833Z ........................ii.ii....................................................................... 5100/9020
2019-09-16T19:22:49.0027390Z .................................................................................................... 5300/9020
2019-09-16T19:22:58.8785148Z ........................................................................................i........... 5400/9020
2019-09-16T19:23:06.8495986Z .................................................................................................... 5500/9020
2019-09-16T19:23:12.0519112Z .................................................................................................... 5600/9020
2019-09-16T19:23:12.0519112Z .................................................................................................... 5600/9020
2019-09-16T19:23:22.2319591Z ...................................................................................ii...i..ii....... 5700/9020
2019-09-16T19:23:47.5704920Z .................................................................................................... 5900/9020
2019-09-16T19:23:57.5338470Z .................................................................................................... 6000/9020
2019-09-16T19:23:57.5338470Z .................................................................................................... 6000/9020
2019-09-16T19:24:03.3957611Z .....................................................................................i..ii.......... 6100/9020
2019-09-16T19:24:33.2411268Z .................................................................................................... 6300/9020
2019-09-16T19:24:36.1881990Z ............................................i....................................................... 6400/9020
2019-09-16T19:24:38.3373750Z .................................................................................................... 6500/9020
2019-09-16T19:24:40.7901724Z ................i................................................................................... 6600/9020
---
2019-09-16T19:29:13.7862279Z  finished in 5.058
2019-09-16T19:29:13.8053213Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T19:29:13.9683602Z 
2019-09-16T19:29:13.9688698Z running 150 tests
2019-09-16T19:29:17.1940783Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-09-16T19:29:19.1888723Z ..iiii..............i.........iii.i.......ii......
2019-09-16T19:29:19.1890426Z 
2019-09-16T19:29:19.1895673Z  finished in 5.384
2019-09-16T19:29:19.2082164Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T19:29:19.7745906Z 
---
2019-09-16T19:29:21.4597654Z  finished in 2.251
2019-09-16T19:29:21.4787003Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T19:29:21.6390495Z 
2019-09-16T19:29:21.6391570Z running 9 tests
2019-09-16T19:29:21.6392731Z iiiiiiiii
2019-09-16T19:29:21.6393429Z 
2019-09-16T19:29:21.6393641Z  finished in 0.160
2019-09-16T19:29:21.6584050Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T19:29:21.8346821Z 
---
2019-09-16T19:29:39.9629144Z  finished in 18.304
2019-09-16T19:29:39.9811379Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T19:29:40.1353923Z 
2019-09-16T19:29:40.1354170Z running 123 tests
2019-09-16T19:30:03.5249792Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-09-16T19:30:08.7847441Z i.i.i......iii.i.....ii
2019-09-16T19:30:08.7929287Z 
2019-09-16T19:30:08.7929344Z  finished in 28.046
2019-09-16T19:30:08.7929971Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T19:30:08.7930315Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-09-16T19:31:09.3051095Z 
2019-09-16T19:31:09.3052768Z ---- [ui] ui-fulldeps/internal-lints/ty_tykind_usage.rs stdout ----
2019-09-16T19:31:09.3053034Z diff of stderr:
2019-09-16T19:31:09.3053176Z 
2019-09-16T19:31:09.3053352Z 1 error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3053802Z -   --> $DIR/ty_tykind_usage.rs:11:15
2019-09-16T19:31:09.3054220Z +   --> $DIR/ty_tykind_usage.rs:11:16
2019-09-16T19:31:09.3054429Z 3    |
2019-09-16T19:31:09.3054581Z 4 LL |     let kind = TyKind::Bool;
2019-09-16T19:31:09.3054976Z -    |               ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3055197Z +    |                ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3055536Z 7 note: lint level defined here
2019-09-16T19:31:09.3056032Z 8   --> $DIR/ty_tykind_usage.rs:9:8
2019-09-16T19:31:09.3056172Z 
2019-09-16T19:31:09.3056275Z 
2019-09-16T19:31:09.3056275Z 
2019-09-16T19:31:09.3056419Z The actual stderr differed from the expected stderr.
2019-09-16T19:31:09.3056812Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/internal-lints/ty_tykind_usage/ty_tykind_usage.stderr
2019-09-16T19:31:09.3057527Z To update references, rerun the tests and pass the `--bless` flag
2019-09-16T19:31:09.3058452Z To only update this specific test, also pass `--test-args internal-lints/ty_tykind_usage.rs`
2019-09-16T19:31:09.3058623Z error: 1 errors occurred comparing output.
2019-09-16T19:31:09.3058659Z status: exit code: 1
2019-09-16T19:31:09.3058659Z status: exit code: 1
2019-09-16T19:31:09.3059704Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/internal-lints/ty_tykind_usage" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Z" "unstable-options" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/internal-lints/ty_tykind_usage/auxiliary" "-A" "unused"
2019-09-16T19:31:09.3060908Z ------------------------------------------
2019-09-16T19:31:09.3061092Z 
2019-09-16T19:31:09.3063253Z ------------------------------------------
2019-09-16T19:31:09.3063341Z stderr:
2019-09-16T19:31:09.3063341Z stderr:
2019-09-16T19:31:09.3063590Z ------------------------------------------
2019-09-16T19:31:09.3063641Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3064218Z    |
2019-09-16T19:31:09.3064218Z    |
2019-09-16T19:31:09.3064271Z LL |     let kind = TyKind::Bool; //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3064345Z    |                ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3064435Z note: lint level defined here
2019-09-16T19:31:09.3064746Z   --> /checkout/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs:9:8
2019-09-16T19:31:09.3064815Z    |
2019-09-16T19:31:09.3064815Z    |
2019-09-16T19:31:09.3064860Z LL | #[deny(rustc::usage_of_ty_tykind)]
2019-09-16T19:31:09.3064953Z 
2019-09-16T19:31:09.3064953Z 
2019-09-16T19:31:09.3065007Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3065333Z    |
2019-09-16T19:31:09.3065333Z    |
2019-09-16T19:31:09.3065403Z LL |         TyKind::Bool => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3065456Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3065498Z 
2019-09-16T19:31:09.3065722Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3066157Z    |
2019-09-16T19:31:09.3066157Z    |
2019-09-16T19:31:09.3066377Z LL |         TyKind::Char => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3066420Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3066445Z 
2019-09-16T19:31:09.3066479Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3066911Z    |
2019-09-16T19:31:09.3066911Z    |
2019-09-16T19:31:09.3067148Z LL |         TyKind::Int(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3067204Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3067226Z 
2019-09-16T19:31:09.3067256Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3067514Z    |
2019-09-16T19:31:09.3067514Z    |
2019-09-16T19:31:09.3067549Z LL |         TyKind::Uint(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3067586Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3067626Z 
2019-09-16T19:31:09.3067657Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3067891Z    |
2019-09-16T19:31:09.3067891Z    |
2019-09-16T19:31:09.3067944Z LL |         TyKind::Float(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3068068Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3068101Z 
2019-09-16T19:31:09.3068151Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3068412Z    |
2019-09-16T19:31:09.3068412Z    |
2019-09-16T19:31:09.3068464Z LL |         TyKind::Adt(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3068511Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3068534Z 
2019-09-16T19:31:09.3068564Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3068817Z    |
2019-09-16T19:31:09.3068817Z    |
2019-09-16T19:31:09.3068851Z LL |         TyKind::Foreign(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3068906Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3068929Z 
2019-09-16T19:31:09.3068961Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3069387Z    |
2019-09-16T19:31:09.3069387Z    |
2019-09-16T19:31:09.3069767Z LL |         TyKind::Str => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3070482Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3070528Z 
2019-09-16T19:31:09.3070586Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3072034Z    |
2019-09-16T19:31:09.3072034Z    |
2019-09-16T19:31:09.3072280Z LL |         TyKind::Array(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3072321Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3072347Z 
2019-09-16T19:31:09.3072762Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3073223Z    |
2019-09-16T19:31:09.3073223Z    |
2019-09-16T19:31:09.3073288Z LL |         TyKind::Slice(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3073361Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3073392Z 
2019-09-16T19:31:09.3073434Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3073775Z    |
2019-09-16T19:31:09.3073775Z    |
2019-09-16T19:31:09.3073834Z LL |         TyKind::RawPtr(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3073885Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3073934Z 
2019-09-16T19:31:09.3073977Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3074315Z    |
2019-09-16T19:31:09.3074315Z    |
2019-09-16T19:31:09.3074364Z LL |         TyKind::Ref(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3074415Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3074455Z 
2019-09-16T19:31:09.3074517Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3074839Z    |
2019-09-16T19:31:09.3074839Z    |
2019-09-16T19:31:09.3074905Z LL |         TyKind::FnDef(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3074957Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3074998Z 
2019-09-16T19:31:09.3075040Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3075380Z    |
2019-09-16T19:31:09.3075380Z    |
2019-09-16T19:31:09.3075428Z LL |         TyKind::FnPtr(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3075497Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3075529Z 
2019-09-16T19:31:09.3075571Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3076269Z    |
2019-09-16T19:31:09.3076269Z    |
2019-09-16T19:31:09.3076307Z LL |         TyKind::Dynamic(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3076347Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3076391Z 
2019-09-16T19:31:09.3076595Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3076911Z    |
2019-09-16T19:31:09.3076911Z    |
2019-09-16T19:31:09.3076951Z LL |         TyKind::Closure(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3076993Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3077019Z 
2019-09-16T19:31:09.3077071Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3077507Z    |
2019-09-16T19:31:09.3077507Z    |
2019-09-16T19:31:09.3077576Z LL |         TyKind::Generator(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3077620Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3077645Z 
2019-09-16T19:31:09.3077702Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3078152Z    |
2019-09-16T19:31:09.3078152Z    |
2019-09-16T19:31:09.3078192Z LL |         TyKind::GeneratorWitness(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3078369Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3078394Z 
2019-09-16T19:31:09.3078635Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3079170Z    |
2019-09-16T19:31:09.3079170Z    |
2019-09-16T19:31:09.3079211Z LL |         TyKind::Never => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3079458Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3079484Z 
2019-09-16T19:31:09.3079527Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3079962Z    |
2019-09-16T19:31:09.3079962Z    |
2019-09-16T19:31:09.3080002Z LL |         TyKind::Tuple(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3080042Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3080074Z 
2019-09-16T19:31:09.3080125Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3080377Z    |
2019-09-16T19:31:09.3080377Z    |
2019-09-16T19:31:09.3080434Z LL |         TyKind::Projection(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3080475Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3080499Z 
2019-09-16T19:31:09.3080551Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3080806Z    |
2019-09-16T19:31:09.3080806Z    |
2019-09-16T19:31:09.3080847Z LL |         TyKind::UnnormalizedProjection(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3080907Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3080932Z 
2019-09-16T19:31:09.3080964Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3081245Z    |
2019-09-16T19:31:09.3081245Z    |
2019-09-16T19:31:09.3081283Z LL |         TyKind::Opaque(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3081343Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3081367Z 
2019-09-16T19:31:09.3081400Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3081668Z    |
2019-09-16T19:31:09.3081668Z    |
2019-09-16T19:31:09.3081944Z LL |         TyKind::Param(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3081992Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3082034Z 
2019-09-16T19:31:09.3082245Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3082948Z    |
2019-09-16T19:31:09.3082948Z    |
2019-09-16T19:31:09.3083014Z LL |         TyKind::Bound(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3083078Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3083109Z 
2019-09-16T19:31:09.3083169Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3083491Z    |
2019-09-16T19:31:09.3083491Z    |
2019-09-16T19:31:09.3083560Z LL |         TyKind::Placeholder(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3083612Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3083643Z 
2019-09-16T19:31:09.3083695Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3084039Z    |
2019-09-16T19:31:09.3084039Z    |
2019-09-16T19:31:09.3084086Z LL |         TyKind::Infer(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3084155Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3084306Z 
2019-09-16T19:31:09.3084349Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3084715Z    |
2019-09-16T19:31:09.3084715Z    |
2019-09-16T19:31:09.3084764Z LL |         TyKind::Error => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3084815Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3084865Z 
2019-09-16T19:31:09.3084907Z error: usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3085255Z    |
2019-09-16T19:31:09.3085255Z    |
2019-09-16T19:31:09.3085306Z LL |     if let TyKind::Int(int_ty) = kind {} //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-16T19:31:09.3085359Z    |            ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-16T19:31:09.3085452Z error: usage of `ty::TyKind`
2019-09-16T19:31:09.3085724Z   --> /checkout/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs:48:24
2019-09-16T19:31:09.3085783Z    |
2019-09-16T19:31:09.3085783Z    |
2019-09-16T19:31:09.3086228Z LL |     fn ty_kind(ty_bad: TyKind<'_>, ty_good: Ty<'_>) {} //~ ERROR usage of `ty::TyKind`
2019-09-16T19:31:09.3086496Z    |
2019-09-16T19:31:09.3086532Z    = help: try using `Ty` instead
2019-09-16T19:31:09.3086575Z 
2019-09-16T19:31:09.3086798Z error: aborting due to 31 previous errors
---
2019-09-16T19:31:09.3087745Z test result: FAILED. 68 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
2019-09-16T19:31:09.3087773Z 
2019-09-16T19:31:09.3087809Z 
2019-09-16T19:31:09.3087835Z 
2019-09-16T19:31:09.3089037Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-09-16T19:31:09.3089262Z 
2019-09-16T19:31:09.3089283Z 
2019-09-16T19:31:09.3089519Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-09-16T19:31:09.3089592Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-16T19:31:09.3089592Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-16T19:31:09.3089635Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-16T19:31:09.3089671Z Build completed unsuccessfully in 1:08:13
2019-09-16T19:31:09.3089723Z == clock drift check ==
2019-09-16T19:31:09.3089757Z   local time: Mon Sep 16 19:31:08 UTC 2019
2019-09-16T19:31:09.3089872Z   network time: Mon, 16 Sep 2019 19:31:08 GMT
2019-09-16T19:31:09.3089925Z == end clock drift check ==
2019-09-16T19:31:09.3815418Z ##[error]Bash exited with code '1'.
2019-09-16T19:31:09.3850892Z ##[section]Starting: Checkout
2019-09-16T19:31:09.3853128Z ==============================================================================
2019-09-16T19:31:09.3853185Z Task         : Get sources
2019-09-16T19:31:09.3853234Z 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
Collaborator

bors commented Sep 16, 2019

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

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 16, 2019
@joelpalmer
Copy link

joelpalmer commented Sep 23, 2019

Ping from Triage: Hi @varkor, any updates?

@varkor
Copy link
Contributor Author

varkor commented Sep 23, 2019

@joelpalmer: I'm waiting on @eddyb to review. This will merge conflict frequently, so I'll rebase when there's some movement on the PR.

@varkor varkor added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2019
@eddyb
Copy link
Member

eddyb commented Sep 25, 2019

Please PM me on Matrix/IRC/Discord if you have something that bitrots easily.

eddyb
eddyb approved these changes Sep 25, 2019
View reviewed changes
Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once this is ready

@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 25, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-09-25T14:58:41.0691367Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-25T14:58:41.0937618Z ##[command]git config gc.auto 0
2019-09-25T14:58:41.1023836Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-25T14:58:41.1087903Z ##[command]git config --get-all http.proxy
2019-09-25T14:58:41.1251526Z ##[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/64513/merge:refs/remotes/pull/64513/merge
---
2019-09-25T16:03:19.8690773Z .................................................................................................... 1500/9043
2019-09-25T16:03:26.4539264Z .................................................................................................... 1600/9043
2019-09-25T16:03:39.6590551Z .........................................................................i...............i.......... 1700/9043
2019-09-25T16:03:46.9573053Z .................................................................................................... 1800/9043
2019-09-25T16:03:56.1364068Z ................................................................iiiii............................... 1900/9043
2019-09-25T16:04:16.7917669Z .................................................................................................... 2100/9043
2019-09-25T16:04:19.5087665Z .................................................................................................... 2200/9043
2019-09-25T16:04:23.0561102Z .................................................................................................... 2300/9043
2019-09-25T16:04:31.8532664Z .................................................................................................... 2400/9043
---
2019-09-25T16:07:41.0889647Z .......................................................i...............i............................ 4700/9043
2019-09-25T16:07:51.0240355Z .................................................................................................... 4800/9043
2019-09-25T16:08:00.2866407Z .................................................................................................... 4900/9043
2019-09-25T16:08:08.4194462Z .................................................................................................... 5000/9043
2019-09-25T16:08:18.8384296Z ..........................................ii.ii..................................................... 5100/9043
2019-09-25T16:08:29.7736219Z .................................................................................................... 5300/9043
2019-09-25T16:08:40.8694458Z .................................................................................................... 5400/9043
2019-09-25T16:08:48.8647401Z .......i............................................................................................ 5500/9043
2019-09-25T16:08:54.7900690Z .................................................................................................... 5600/9043
2019-09-25T16:08:54.7900690Z .................................................................................................... 5600/9043
2019-09-25T16:09:07.9238303Z .................................................................................................... 5700/9043
2019-09-25T16:09:21.8872575Z ..ii...i...ii..........i............................................................................ 5800/9043
2019-09-25T16:09:44.7397289Z .................................................................................................... 6000/9043
2019-09-25T16:09:54.0333622Z .................................................................................................... 6100/9043
2019-09-25T16:09:54.0333622Z .................................................................................................... 6100/9043
2019-09-25T16:10:08.9838699Z ....i..ii........................................................................................... 6200/9043
2019-09-25T16:10:29.1154204Z ................................................................i................................... 6400/9043
2019-09-25T16:10:31.4647794Z .................................................................................................... 6500/9043
2019-09-25T16:10:34.2391070Z ....................................i............................................................... 6600/9043
2019-09-25T16:10:38.4857089Z .................................................................................................... 6700/9043
---
2019-09-25T16:15:19.8130527Z  finished in 5.473
2019-09-25T16:15:19.8322845Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-25T16:15:20.0040835Z 
2019-09-25T16:15:20.0041178Z running 150 tests
2019-09-25T16:15:23.4016770Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-09-25T16:15:25.4578244Z ..iiii..............i.........iii.i.......ii......
2019-09-25T16:15:25.4578922Z 
2019-09-25T16:15:25.4583226Z  finished in 5.626
2019-09-25T16:15:25.4768480Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-25T16:15:25.6386927Z 
---
2019-09-25T16:15:27.7990768Z  finished in 2.322
2019-09-25T16:15:27.8201594Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-25T16:15:27.9811697Z 
2019-09-25T16:15:27.9812031Z running 9 tests
2019-09-25T16:15:27.9812904Z iiiiiiiii
2019-09-25T16:15:27.9813264Z 
2019-09-25T16:15:27.9818227Z  finished in 0.161
2019-09-25T16:15:28.0021496Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-25T16:15:28.1719968Z 
---
2019-09-25T16:15:46.8993068Z  finished in 18.897
2019-09-25T16:15:46.9209780Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-25T16:15:47.0927362Z 
2019-09-25T16:15:47.0928893Z running 123 tests
2019-09-25T16:16:12.9170801Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-09-25T16:16:17.9078569Z i.i.i......iii.i.....ii
2019-09-25T16:16:17.9080054Z 
2019-09-25T16:16:17.9082471Z  finished in 30.987
2019-09-25T16:16:17.9096938Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-25T16:16:17.9097711Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-09-25T16:17:22.5320099Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-25T16:17:22.5321145Z ---- [ui] ui-fulldeps/internal-lints/ty_tykind_usage.rs stdout ----
2019-09-25T16:17:22.5321426Z diff of stderr:
2019-09-25T16:17:22.5321598Z 
2019-09-25T16:17:22.5321759Z 1 error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5322175Z -   --> $DIR/ty_tykind_usage.rs:11:15
2019-09-25T16:17:22.5322955Z +   --> $DIR/ty_tykind_usage.rs:11:16
2019-09-25T16:17:22.5323164Z 3    |
2019-09-25T16:17:22.5323310Z 4 LL |     let kind = TyKind::Bool;
2019-09-25T16:17:22.5323731Z -    |               ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5323951Z +    |                ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5324268Z 7 note: lint level defined here
2019-09-25T16:17:22.5324675Z 8   --> $DIR/ty_tykind_usage.rs:9:8
2019-09-25T16:17:22.5324843Z 
2019-09-25T16:17:22.5324988Z 
2019-09-25T16:17:22.5324988Z 
2019-09-25T16:17:22.5325157Z The actual stderr differed from the expected stderr.
2019-09-25T16:17:22.5325631Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/internal-lints/ty_tykind_usage/ty_tykind_usage.stderr
2019-09-25T16:17:22.5326103Z To update references, rerun the tests and pass the `--bless` flag
2019-09-25T16:17:22.5326592Z To only update this specific test, also pass `--test-args internal-lints/ty_tykind_usage.rs`
2019-09-25T16:17:22.5326953Z error: 1 errors occurred comparing output.
2019-09-25T16:17:22.5327099Z status: exit code: 1
2019-09-25T16:17:22.5327099Z status: exit code: 1
2019-09-25T16:17:22.5328231Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/internal-lints/ty_tykind_usage" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Z" "unstable-options" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/internal-lints/ty_tykind_usage/auxiliary" "-A" "unused"
2019-09-25T16:17:22.5329328Z ------------------------------------------
2019-09-25T16:17:22.5329537Z 
2019-09-25T16:17:22.5329908Z ------------------------------------------
2019-09-25T16:17:22.5330592Z stderr:
2019-09-25T16:17:22.5330592Z stderr:
2019-09-25T16:17:22.5331428Z ------------------------------------------
2019-09-25T16:17:22.5331667Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5332308Z    |
2019-09-25T16:17:22.5332308Z    |
2019-09-25T16:17:22.5332460Z LL |     let kind = TyKind::Bool; //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5332613Z    |                ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5332947Z note: lint level defined here
2019-09-25T16:17:22.5333372Z   --> /checkout/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs:9:8
2019-09-25T16:17:22.5333568Z    |
2019-09-25T16:17:22.5333568Z    |
2019-09-25T16:17:22.5333733Z LL | #[deny(rustc::usage_of_ty_tykind)]
2019-09-25T16:17:22.5334003Z 
2019-09-25T16:17:22.5334003Z 
2019-09-25T16:17:22.5334147Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5334797Z    |
2019-09-25T16:17:22.5334797Z    |
2019-09-25T16:17:22.5334950Z LL |         TyKind::Bool => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5335103Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5335247Z 
2019-09-25T16:17:22.5335392Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5335989Z    |
2019-09-25T16:17:22.5335989Z    |
2019-09-25T16:17:22.5336148Z LL |         TyKind::Char => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5336322Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5336464Z 
2019-09-25T16:17:22.5336612Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5338021Z    |
2019-09-25T16:17:22.5338021Z    |
2019-09-25T16:17:22.5338201Z LL |         TyKind::Int(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5338865Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5339058Z 
2019-09-25T16:17:22.5339226Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5339925Z    |
2019-09-25T16:17:22.5339925Z    |
2019-09-25T16:17:22.5340076Z LL |         TyKind::Uint(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5340252Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5340376Z 
2019-09-25T16:17:22.5340547Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5341262Z    |
2019-09-25T16:17:22.5341262Z    |
2019-09-25T16:17:22.5341416Z LL |         TyKind::Float(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5341587Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5341728Z 
2019-09-25T16:17:22.5341872Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5342497Z    |
2019-09-25T16:17:22.5342497Z    |
2019-09-25T16:17:22.5342668Z LL |         TyKind::Adt(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5342820Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5342945Z 
2019-09-25T16:17:22.5343123Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5343866Z    |
2019-09-25T16:17:22.5343866Z    |
2019-09-25T16:17:22.5344068Z LL |         TyKind::Foreign(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5344231Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5344358Z 
2019-09-25T16:17:22.5344523Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5345194Z    |
2019-09-25T16:17:22.5345194Z    |
2019-09-25T16:17:22.5345447Z LL |         TyKind::Str => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5345626Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5345756Z 
2019-09-25T16:17:22.5345899Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5346542Z    |
2019-09-25T16:17:22.5346542Z    |
2019-09-25T16:17:22.5346706Z LL |         TyKind::Array(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5346872Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5346998Z 
2019-09-25T16:17:22.5347139Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5347769Z    |
2019-09-25T16:17:22.5347769Z    |
2019-09-25T16:17:22.5347933Z LL |         TyKind::Slice(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5348101Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5348224Z 
2019-09-25T16:17:22.5348386Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5349381Z    |
2019-09-25T16:17:22.5349381Z    |
2019-09-25T16:17:22.5349558Z LL |         TyKind::RawPtr(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5350385Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5350593Z 
2019-09-25T16:17:22.5350744Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5351476Z    |
2019-09-25T16:17:22.5351476Z    |
2019-09-25T16:17:22.5351646Z LL |         TyKind::Ref(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5351798Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5351922Z 
2019-09-25T16:17:22.5352082Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5352939Z    |
2019-09-25T16:17:22.5352939Z    |
2019-09-25T16:17:22.5353111Z LL |         TyKind::FnDef(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5353271Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5353397Z 
2019-09-25T16:17:22.5353539Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5354176Z    |
2019-09-25T16:17:22.5354176Z    |
2019-09-25T16:17:22.5354341Z LL |         TyKind::FnPtr(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5354494Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5354619Z 
2019-09-25T16:17:22.5354778Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5355388Z    |
2019-09-25T16:17:22.5355388Z    |
2019-09-25T16:17:22.5355537Z LL |         TyKind::Dynamic(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5355709Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5355834Z 
2019-09-25T16:17:22.5355995Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5357425Z    |
2019-09-25T16:17:22.5357425Z    |
2019-09-25T16:17:22.5357491Z LL |         TyKind::Closure(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5357679Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5357721Z 
2019-09-25T16:17:22.5357779Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5358778Z    |
2019-09-25T16:17:22.5358778Z    |
2019-09-25T16:17:22.5358834Z LL |         TyKind::Generator(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5358908Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5358954Z 
2019-09-25T16:17:22.5358996Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5359395Z    |
2019-09-25T16:17:22.5359395Z    |
2019-09-25T16:17:22.5359446Z LL |         TyKind::GeneratorWitness(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5359514Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5359544Z 
2019-09-25T16:17:22.5359587Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5359915Z    |
2019-09-25T16:17:22.5359915Z    |
2019-09-25T16:17:22.5359962Z LL |         TyKind::Never => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5360013Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5360058Z 
2019-09-25T16:17:22.5360102Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5360415Z    |
2019-09-25T16:17:22.5360415Z    |
2019-09-25T16:17:22.5360478Z LL |         TyKind::Tuple(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5360529Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5360559Z 
2019-09-25T16:17:22.5360615Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5360916Z    |
2019-09-25T16:17:22.5360916Z    |
2019-09-25T16:17:22.5360972Z LL |         TyKind::Projection(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5361041Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5361071Z 
2019-09-25T16:17:22.5361114Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5361433Z    |
2019-09-25T16:17:22.5361433Z    |
2019-09-25T16:17:22.5361651Z LL |         TyKind::UnnormalizedProjection(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5361720Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5361751Z 
2019-09-25T16:17:22.5361793Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5362154Z    |
2019-09-25T16:17:22.5362154Z    |
2019-09-25T16:17:22.5362203Z LL |         TyKind::Opaque(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5362265Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5362310Z 
2019-09-25T16:17:22.5362755Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5365912Z    |
2019-09-25T16:17:22.5365912Z    |
2019-09-25T16:17:22.5366218Z LL |         TyKind::Param(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5366272Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5366648Z 
2019-09-25T16:17:22.5366722Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5367191Z    |
2019-09-25T16:17:22.5367191Z    |
2019-09-25T16:17:22.5367255Z LL |         TyKind::Bound(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5367307Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5367338Z 
2019-09-25T16:17:22.5367382Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5367883Z    |
2019-09-25T16:17:22.5367883Z    |
2019-09-25T16:17:22.5367934Z LL |         TyKind::Placeholder(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5367995Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5368052Z 
2019-09-25T16:17:22.5368095Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5368471Z    |
2019-09-25T16:17:22.5368471Z    |
2019-09-25T16:17:22.5368521Z LL |         TyKind::Infer(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5368844Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5368878Z 
2019-09-25T16:17:22.5369307Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5370007Z    |
2019-09-25T16:17:22.5370007Z    |
2019-09-25T16:17:22.5370090Z LL |         TyKind::Error => (), //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5370142Z    |         ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5370172Z 
2019-09-25T16:17:22.5370213Z error: usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5370548Z    |
2019-09-25T16:17:22.5370548Z    |
2019-09-25T16:17:22.5370606Z LL |     if let TyKind::Int(int_ty) = kind {} //~ ERROR usage of `ty::TyKind::<kind>`
2019-09-25T16:17:22.5370675Z    |            ^^^^^^ help: try using ty::<kind> directly: `ty`
2019-09-25T16:17:22.5370748Z error: usage of `ty::TyKind`
2019-09-25T16:17:22.5371009Z   --> /checkout/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.rs:48:24
2019-09-25T16:17:22.5371076Z    |
2019-09-25T16:17:22.5371076Z    |
2019-09-25T16:17:22.5371342Z LL |     fn ty_kind(ty_bad: TyKind<'_>, ty_good: Ty<'_>) {} //~ ERROR usage of `ty::TyKind`
2019-09-25T16:17:22.5371455Z    |
2019-09-25T16:17:22.5371507Z    = help: try using `Ty` instead
2019-09-25T16:17:22.5371537Z 
2019-09-25T16:17:22.5371596Z error: aborting due to 31 previous errors
---
2019-09-25T16:17:22.5372789Z test result: FAILED. 68 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
2019-09-25T16:17:22.5372824Z 
2019-09-25T16:17:22.5372849Z 
2019-09-25T16:17:22.5372874Z 
2019-09-25T16:17:22.5374435Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-09-25T16:17:22.5374714Z 
2019-09-25T16:17:22.5374760Z 
2019-09-25T16:17:22.5374855Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-25T16:17:22.5374907Z Build completed unsuccessfully in 1:11:06
2019-09-25T16:17:22.5374907Z Build completed unsuccessfully in 1:11:06
2019-09-25T16:17:22.5374970Z == clock drift check ==
2019-09-25T16:17:22.5384051Z   local time: Wed Sep 25 16:17:22 UTC 2019
2019-09-25T16:17:22.8049549Z   network time: Wed, 25 Sep 2019 16:17:22 GMT
2019-09-25T16:17:22.8055648Z == end clock drift check ==
2019-09-25T16:17:23.8021954Z ##[error]Bash exited with code '1'.
2019-09-25T16:17:23.8062829Z ##[section]Starting: Checkout
2019-09-25T16:17:23.8065652Z ==============================================================================
2019-09-25T16:17:23.8065719Z Task         : Get sources
2019-09-25T16:17:23.8065772Z 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)

@varkor
Copy link
Contributor Author

varkor commented Sep 25, 2019

@bors r=eddyb p=1
(Bitrots quickly.)

@bors
Copy link
Collaborator

bors commented Sep 25, 2019

📌 Commit ef1303dec25d393558c292ac58715018eaca875e has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 25, 2019
@Centril
Copy link
Contributor

Centril commented Sep 25, 2019

I think we should follow this up with renaming node to kind as well to be consistent.

@rust-highfive

This comment has been minimized.

Sign in to view
@varkor
Copy link
Contributor Author

varkor commented Sep 25, 2019

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Sep 25, 2019

📌 Commit bc2a373 has been approved by eddyb

Centril added a commit to Centril/rust that referenced this pull request Sep 26, 2019
@Centril
Rollup merge of rust-lang#64513 - varkor:sty-begone, r=eddyb
db3fc45 
Rename `TyS.sty` to `TyS.kind`

Fixes rust-lang#64353.

r? @eddyb
@Centril Centril mentioned this pull request Sep 26, 2019
Closed
@bors
Copy link
Collaborator

bors commented Sep 26, 2019

⌛ Testing commit bc2a373 with merge c90053cdd7caf010001f6afae9cd9fbf805c6649...

Centril added a commit to Centril/rust that referenced this pull request Sep 26, 2019
@Centril
Rollup merge of rust-lang#64513 - varkor:sty-begone, r=eddyb
64e8527 
Rename `TyS.sty` to `TyS.kind`

Fixes rust-lang#64353.

r? @eddyb
@Centril Centril mentioned this pull request Sep 26, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Sep 26, 2019

@bors retry rolled up.

@bors
Copy link
Collaborator

bors commented Sep 26, 2019

⌛ Testing commit bc2a373 with merge dc45735...

bors added a commit that referenced this pull request Sep 26, 2019
@bors
Auto merge of #64513 - varkor:sty-begone, r=eddyb
dc45735 
Rename `TyS.sty` to `TyS.kind`

Fixes #64353.

r? @eddyb
@bors
Copy link
Collaborator

bors commented Sep 26, 2019

☀️ Test successful - checks-azure
Approved by: eddyb
Pushing dc45735 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 26, 2019
@bors bors merged commit bc2a373 into rust-lang:master Sep 26, 2019
@rust-highfive rust-highfive mentioned this pull request Sep 26, 2019
Closed
@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 26, 2019

📣 Toolstate changed by #64513!

Tested on commit dc45735.
Direct link to PR: #64513

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 26, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#64513!
cae658b 
Tested on commit rust-lang/rust@dc45735.
Direct link to PR: <rust-lang/rust#64513>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
This was referenced Sep 26, 2019
Closed
Closed
Closed
Merged
Merged
Merged
Merged
Merged
Closed
tesuji added a commit to tesuji/rust-clippy that referenced this pull request Sep 26, 2019
@tesuji
Rustup rust-lang/rust#64513
a7b7e19
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Sep 26, 2019
@flip1995
Rustup to rust-lang/rust#64513
2b4cb85
bors added a commit to rust-lang/rust-clippy that referenced this pull request Sep 26, 2019
@bors
Auto merge of #4580 - lzutao:rustup, r=flip1995
3335209 
Rustup rust-lang/rust#64513

changelog: none
ecstatic-morse added a commit to ecstatic-morse/rust that referenced this pull request Sep 28, 2019
@ecstatic-morse
Rename sty to kind
0bf1a80 
Picks up changes made in rust-lang#64513
@ecstatic-morse ecstatic-morse mentioned this pull request Sep 28, 2019
Merged
andjo403 pushed a commit to andjo403/rust that referenced this pull request Oct 4, 2019
@ecstatic-morse @andjo403
Rename sty to kind
06d9894 
Picks up changes made in rust-lang#64513
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@eddyb eddyb eddyb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@eddyb eddyb

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Rename .sty field on TyS

6 participants

@varkor @rust-highfive @bors @joelpalmer @eddyb @Centril