Rename TyVariants and variants #53581

varkor · 2018-08-22T00:18:29Z

Rename TypeVariants to TyKind.
Remove the Ty prefix from each one of its variants (plus the identically-named variants of PrimTy).
Rename ty::Slice to ty::List.

The new names look cleaner.

Mark-Simulacrum · 2018-08-22T00:41:14Z

src/librustc/hir/def.rs

@@ -53,13 +53,13 @@ pub enum Def {
    Existential(DefId),
    /// `type Foo = Bar;`
    TyAlias(DefId),
-    TyForeign(DefId),
+    Foreign(DefId),
    TraitAlias(DefId),
    AssociatedTy(DefId),
    /// `existential type Foo: Bar;`
    AssociatedExistential(DefId),
    PrimTy(hir::PrimTy),


Hm, maybe drop Ty here too? And in the other cases perhaps?

No, this is "primitive type". Def contains both types and values.

eddyb · 2018-08-22T00:43:15Z

cc @nikomatsakis

eddyb · 2018-08-22T00:47:14Z

src/librustc/hir/def.rs

@@ -53,13 +53,13 @@ pub enum Def {
    Existential(DefId),
    /// `type Foo = Bar;`
    TyAlias(DefId),
-    TyForeign(DefId),
+    Foreign(DefId),


This seems suboptimal... what if you first rename this to ForeignTy and then do the other renames?

eddyb · 2018-08-22T00:47:47Z

src/librustc/hir/def.rs

    TraitAlias(DefId),
    AssociatedTy(DefId),
    /// `existential type Foo: Bar;`
    AssociatedExistential(DefId),
    PrimTy(hir::PrimTy),
-    TyParam(DefId),
+    Param(DefId),


We probably want to keep this the way it is, assuming we need to tell apart ty params from const ones.

rust-highfive · 2018-08-22T02:11:51Z

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:45:55] ....................................................................................................
[00:45:58] ....................................................................................................
[00:46:01] ....................................................................................................
[00:46:04] ....................................................................................................
[00:46:07] ..................................................................................F.................
[00:46:13] ....................................................................................................
[00:46:17] ....................................................................................................
[00:46:19] ......................................i.............................................................
[00:46:22] ........................................................................................i.i..ii.....
---
[00:47:04] diff of stderr:
[00:47:04] 
[00:47:04] 2   --> $DIR/issue-46332.rs:19:5
[00:47:04] 3    |
[00:47:04] 4 LL |     TyUInt {};
[00:47:04] -    |     ^^^^^^ did you mean `TyUint`?
[00:47:04] 6 
[00:47:04] 7 error: aborting due to previous error
[00:47:04] 8 
[00:47:04] 
[00:47:04] 
[00:47:04] 
[00:47:04] The actual stderr differed from the expected stderr.
[00:47:04] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-46332/issue-46332.stderr
[00:47:04] To update references, rerun the tests and pass the `--bless` flag
[00:47:04] To only update this specific test, also pass `--test-args issues/issue-46332.rs`
[00:47:04] error: 1 errors occurred comparing output.
[00:47:04] status: exit code: 1
[00:47:04] status: exit code: 1
[00:47:04] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/u "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--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-5.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -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" "5.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"
[00:47:04] 
[00:47:04] 
[00:47:04] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[00:47:04] Build completed unsuccessfully in 0:03:05
[00:47:04] Build completed unsuccessfully in 0:03:05
[00:47:04] Makefile:58: recipe for target 'check' failed
[00:47:04] make: *** [check] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0cbec385
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0cccfb82:start=1534903907850094846,finish=1534903907858103470,duration=8008624
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0f032a19
$ ln -s . checkout && fo

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 · 2018-08-22T03:12:31Z

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

eddyb · 2018-08-22T04:49:57Z

src/librustc/hir/def.rs

@@ -53,13 +53,13 @@ pub enum Def {
    Existential(DefId),
    /// `type Foo = Bar;`
    TyAlias(DefId),
-    Foreign(DefId),
+    TyForeign(DefId),


I prefer ForeignTy, specifically, just like AssociatedTy below.

eddyb · 2018-08-22T11:57:05Z

src/test/ui/privacy/private-inferred-type-1.rs

    fn ty_param_secret(&self);
 }

 mod m {
    struct Priv;

    impl ::Arr0 for [Priv; 0] { fn arr0_secret(&self) {} }
-    impl ::TyParam for Option<Priv> { fn ty_param_secret(&self) {} }
+    impl ::Param for Option<Priv> { fn ty_param_secret(&self) {} }


Hehe you don't need to change this.

bors · 2018-08-22T13:27:37Z

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

eddyb · 2018-08-22T15:04:30Z

@varkor r=me when you rebase

…ic|Closure|Generator|GeneratorWitness|Never|Tuple|Projection|Anon|Infer|Error}

varkor · 2018-08-22T15:34:20Z

@bors r=eddyb p=10

(This bitrots very quickly.)

bors · 2018-08-22T15:34:22Z

📌 Commit 71722b9 has been approved by eddyb

bors · 2018-08-22T17:43:50Z

⌛ Testing commit 71722b9 with merge b75b047...

@eddyb

Rename TyVariants and variants - Rename `TypeVariants` to `TyKind`. - Remove the `Ty` prefix from each one of its variants (plus the identically-named variants of `PrimTy`). - Rename `ty::Slice` to `ty::List`. The new names look cleaner. r? @eddyb

bors · 2018-08-22T19:59:47Z

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing b75b047 to master...

rust-highfive · 2018-08-22T20:01:06Z

📣 Toolstate changed by #53581!

Tested on commit b75b047.
Direct link to PR: #53581

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

@Manishearth

Tested on commit rust-lang/rust@b75b047. Direct link to PR: <rust-lang/rust#53581> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).

rustup, fix breakage introduced by rust-lang/rust#53581 and rust-lang/rust#53459

This has been renamed in rust-lang/rust#53581.

rust-highfive assigned eddyb Aug 22, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2018

varkor force-pushed the tyvariants-rename branch from 6e61e3e to efe7612 Compare August 22, 2018 00:38

Mark-Simulacrum reviewed Aug 22, 2018

View reviewed changes

eddyb reviewed Aug 22, 2018

View reviewed changes

varkor force-pushed the tyvariants-rename branch from 4afca34 to f3fcbbc Compare August 22, 2018 01:23

eddyb reviewed Aug 22, 2018

View reviewed changes

varkor force-pushed the tyvariants-rename branch from 673fe3f to f6557d0 Compare August 22, 2018 10:54

eddyb reviewed Aug 22, 2018

View reviewed changes

varkor force-pushed the tyvariants-rename branch from f6557d0 to b3018a9 Compare August 22, 2018 12:02

petrochenkov self-assigned this Aug 22, 2018

varkor added 8 commits August 22, 2018 16:05

Rename ty::Slice to ty::List

87c7e57

Rename ty::TyVariants to ty::TyKind

d37cee3

Remove Ty prefix from Ty{Adt|Array|Slice|RawPtr|Ref|FnDef|FnPtr|Dynam…

6f637da

…ic|Closure|Generator|GeneratorWitness|Never|Tuple|Projection|Anon|Infer|Error}

Remove Ty prefix from Ty{Foreign|Param}

04fa5d3

Remove Ty prefix from Ty{Bool|Char|Int|Uint|Float|Str}

8a5dccd

Remove unnecessary TyKind::s

08f3685

Rename Def::{Param, Foreign} to Def::{TyParam, TyForeign}

05cfb3f

Replace TyForeign with ForeignTy

d0209c4

varkor force-pushed the tyvariants-rename branch from b3018a9 to 4e62df4 Compare August 22, 2018 15:15

Fix rebase issues

71722b9

varkor force-pushed the tyvariants-rename branch from 4e62df4 to 71722b9 Compare August 22, 2018 15:16

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 Aug 22, 2018

bors merged commit 71722b9 into rust-lang:master Aug 22, 2018

bors mentioned this pull request Aug 22, 2018

[NLL] Be more permissive when checking access due to Match #53438

Merged

varkor deleted the tyvariants-rename branch August 22, 2018 20:04

This was referenced Aug 22, 2018

Replace CanonicalVar with DebruijnIndex #52984

Merged

Don't reduce E0161 to a warning in NLL migrate mode #53575

Merged

matthiaskrgr mentioned this pull request Aug 22, 2018

submodules: update rls #53610

Closed

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Aug 22, 2018

rustup, fix breakage introduced by rust-lang/rust#53581

712d2d4

petrochenkov removed their assignment Aug 22, 2018

flip1995 added a commit to rust-lang/rust-clippy that referenced this pull request Aug 23, 2018

Merge pull request #3072 from matthiaskrgr/rustup

e9c3d3d

rustup, fix breakage introduced by rust-lang/rust#53581 and rust-lang/rust#53459

nikic added a commit to nikic/rustc-guide that referenced this pull request Oct 26, 2018

Update TypeVariants to TyKind

1486fca

This has been renamed in rust-lang/rust#53581.

nikic mentioned this pull request Oct 26, 2018

Update TypeVariants to TyKind rust-lang/rustc-dev-guide#220

Merged

mark-i-m pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Oct 26, 2018

Update TypeVariants to TyKind

34c9d3f

This has been renamed in rust-lang/rust#53581.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename TyVariants and variants #53581

Rename TyVariants and variants #53581

varkor commented Aug 22, 2018 •

edited

Loading

Mark-Simulacrum Aug 22, 2018

eddyb Aug 22, 2018

eddyb commented Aug 22, 2018

eddyb Aug 22, 2018

eddyb Aug 22, 2018

rust-highfive commented Aug 22, 2018

bors commented Aug 22, 2018

eddyb Aug 22, 2018

eddyb Aug 22, 2018

varkor Aug 22, 2018

bors commented Aug 22, 2018

eddyb commented Aug 22, 2018 •

edited

Loading

varkor commented Aug 22, 2018

bors commented Aug 22, 2018

bors commented Aug 22, 2018

bors commented Aug 22, 2018

rust-highfive commented Aug 22, 2018

Rename TyVariants and variants #53581

Rename TyVariants and variants #53581

Conversation

varkor commented Aug 22, 2018 • edited Loading

Mark-Simulacrum Aug 22, 2018

Choose a reason for hiding this comment

eddyb Aug 22, 2018

Choose a reason for hiding this comment

eddyb commented Aug 22, 2018

eddyb Aug 22, 2018

Choose a reason for hiding this comment

eddyb Aug 22, 2018

Choose a reason for hiding this comment

rust-highfive commented Aug 22, 2018

bors commented Aug 22, 2018

eddyb Aug 22, 2018

Choose a reason for hiding this comment

eddyb Aug 22, 2018

Choose a reason for hiding this comment

varkor Aug 22, 2018

Choose a reason for hiding this comment

bors commented Aug 22, 2018

eddyb commented Aug 22, 2018 • edited Loading

varkor commented Aug 22, 2018

bors commented Aug 22, 2018

bors commented Aug 22, 2018

bors commented Aug 22, 2018

rust-highfive commented Aug 22, 2018

varkor commented Aug 22, 2018 •

edited

Loading

eddyb commented Aug 22, 2018 •

edited

Loading