Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` #123016

compiler-errors · 2024-03-24T22:55:15Z

It's annoying to have to import TypeVariableOriginKind just to fill it with MiscVariable for almost every use. Every other usage other than TypeParameterDefinition wasn't even used -- I can see how it may have been useful once for debugging, but I do quite a lot of typeck debugging and I've never really needed it.

So let's just remove it, and keep around the only useful thing which is the DefId of the param for var_for_def.

This is based on #123006, which removed the special use of TypeVariableOriginKind::OpaqueInference, which I'm pretty sure I was the one that added.

r? lcnr or re-roll to types

rustbot · 2024-03-24T22:55:22Z

Some changes occurred in match lowering

cc @Nadrieril

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Type relation code was changed

cc @compiler-errors, @lcnr

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

bors · 2024-03-28T03:35:13Z

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

compiler/rustc_hir_typeck/src/pat.rs

compiler/rustc_infer/src/infer/opaque_types/mod.rs

compiler/rustc_middle/src/infer/unify_key.rs

lcnr

please make sure to update all relevant comments

after that r=me, a really nice cleanup imo ❤️

lcnr · 2024-04-05T21:14:17Z

@bors r+

bors · 2024-04-05T21:14:20Z

📌 Commit 7dead92 has been approved by lcnr

It is now in the queue for this repository.

…, r=lcnr Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` It's annoying to have to import `TypeVariableOriginKind` just to fill it with `MiscVariable` for almost every use. Every other usage other than `TypeParameterDefinition` wasn't even used -- I can see how it may have been useful once for debugging, but I do quite a lot of typeck debugging and I've never really needed it. So let's just remove it, and keep around the only useful thing which is the `DefId` of the param for `var_for_def`. This is based on rust-lang#123006, which removed the special use of `TypeVariableOriginKind::OpaqueInference`, which I'm pretty sure I was the one that added. r? lcnr or re-roll to types

matthiaskrgr · 2024-04-06T07:05:24Z

mh may need another rebase

…r=lcnr Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` It's annoying to have to import `TypeVariableOriginKind` just to fill it with `MiscVariable` for almost every use. Every other usage other than `TypeParameterDefinition` wasn't even used -- I can see how it may have been useful once for debugging, but I do quite a lot of typeck debugging and I've never really needed it. So let's just remove it, and keep around the only useful thing which is the `DefId` of the param for `var_for_def`. This is based on rust-lang#123006, which removed the special use of `TypeVariableOriginKind::OpaqueInference`, which I'm pretty sure I was the one that added. r? lcnr or re-roll to types

bors · 2024-04-06T15:01:56Z

⌛ Testing commit 7dead92 with merge dd3b001...

bors · 2024-04-06T15:09:17Z

💔 Test failed - checks-actions

bors · 2024-04-11T03:16:31Z

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

compiler-errors · 2024-04-15T21:55:35Z

@bors r=lcnr

bors · 2024-04-15T21:55:38Z

📌 Commit 98890be has been approved by lcnr

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - rust-lang#123016 (Remove `TypeVariableOriginKind` and `ConstVariableOriginKind`) - rust-lang#123462 (Cleanup: Rename `ModSep` to `PathSep`) - rust-lang#123603 (Don't even parse an intrinsic unless the feature gate is enabled) - rust-lang#123926 (Fix pretty HIR for anon consts in diagnostics) - rust-lang#123973 (crashes: readme: add reminder to add Fixes #abcde to prs to automatically close issues.) - rust-lang#123984 (sanitizers: Add rustc_sanitizers to triagebot.toml) - rust-lang#123989 (Just use `type_dependent_def_id` to figure out what the method is for an expr) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#123016 - compiler-errors:no-type-var-origin, r=lcnr Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` It's annoying to have to import `TypeVariableOriginKind` just to fill it with `MiscVariable` for almost every use. Every other usage other than `TypeParameterDefinition` wasn't even used -- I can see how it may have been useful once for debugging, but I do quite a lot of typeck debugging and I've never really needed it. So let's just remove it, and keep around the only useful thing which is the `DefId` of the param for `var_for_def`. This is based on rust-lang#123006, which removed the special use of `TypeVariableOriginKind::OpaqueInference`, which I'm pretty sure I was the one that added. r? lcnr or re-roll to types

* Update for nix Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Update to Rust 1.80.0 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Rename to BindingMode from BindingAnnotation rust-lang/rust#124047 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove TypeVariableOriginKind rust-lang/rust#123016 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove TypeVariableOrigin rust-lang/rust#124955 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove LintDiagnostic::msg rust-lang/rust#125410 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * common.rs fmt mistake indents Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * trace_in_no_trace.rs remove mistake space Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * trace_in_no_trace.rs remove mistake head space Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> --------- Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>

* Update for nix Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Update to Rust 1.80.0 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Rename to BindingMode from BindingAnnotation rust-lang/rust#124047 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove TypeVariableOriginKind rust-lang/rust#123016 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove TypeVariableOrigin rust-lang/rust#124955 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove LintDiagnostic::msg rust-lang/rust#125410 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * common.rs fmt mistake indents Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * trace_in_no_trace.rs remove mistake space Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * trace_in_no_trace.rs remove mistake head space Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Workaround for #32912 It's dirty but it worked on 2000 runs Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --------- Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>

* Update for nix Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Update to Rust 1.80.0 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Rename to BindingMode from BindingAnnotation rust-lang/rust#124047 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove TypeVariableOriginKind rust-lang/rust#123016 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove TypeVariableOrigin rust-lang/rust#124955 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Remove LintDiagnostic::msg rust-lang/rust#125410 Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * common.rs fmt mistake indents Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * trace_in_no_trace.rs remove mistake space Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * trace_in_no_trace.rs remove mistake head space Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> * Workaround for servo#32912 It's dirty but it worked on 2000 runs Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --------- Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>

rustbot assigned lcnr Mar 24, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 24, 2024

rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Mar 24, 2024

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the no-type-var-origin branch from 8bb5d4d to c6bcf4d Compare March 27, 2024 17:53

compiler-errors force-pushed the no-type-var-origin branch from c6bcf4d to 101195c Compare March 29, 2024 15:12

lcnr reviewed Mar 30, 2024

View reviewed changes

compiler/rustc_hir_typeck/src/pat.rs Outdated Show resolved Hide resolved

lcnr reviewed Mar 30, 2024

View reviewed changes

compiler/rustc_infer/src/infer/opaque_types/mod.rs Outdated Show resolved Hide resolved

lcnr reviewed Mar 30, 2024

View reviewed changes

compiler/rustc_middle/src/infer/unify_key.rs Outdated Show resolved Hide resolved

lcnr reviewed Mar 30, 2024

View reviewed changes

compiler-errors force-pushed the no-type-var-origin branch 2 times, most recently from 4ef1df1 to 7dead92 Compare April 5, 2024 17:37

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 Apr 5, 2024

matthiaskrgr mentioned this pull request Apr 6, 2024

Rollup of 7 pull requests #123539

Closed

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 6, 2024

compiler-errors force-pushed the no-type-var-origin branch from 7dead92 to a654c97 Compare April 6, 2024 21:03

compiler-errors added 5 commits April 15, 2024 16:51

Remove TypeVariableOriginKind

34bce07

Remove ConstVariableOriginKind

eb6f856

Account for Self params properly

ba6c166

nits

25c0cf0

Rebase fallout

98890be

compiler-errors force-pushed the no-type-var-origin branch from a654c97 to 98890be Compare April 15, 2024 21:38

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 Apr 15, 2024

fmease mentioned this pull request Apr 15, 2024

Rollup of 7 pull requests #123991

Merged

bors merged commit 9cc26b5 into rust-lang:master Apr 16, 2024
11 checks passed

rustbot added this to the 1.79.0 milestone Apr 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` #123016

Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` #123016

compiler-errors commented Mar 24, 2024

rustbot commented Mar 24, 2024

This comment has been minimized.

bors commented Mar 28, 2024

lcnr left a comment

lcnr commented Apr 5, 2024

bors commented Apr 5, 2024

matthiaskrgr commented Apr 6, 2024

bors commented Apr 6, 2024

This comment has been minimized.

bors commented Apr 6, 2024

bors commented Apr 11, 2024

compiler-errors commented Apr 15, 2024

bors commented Apr 15, 2024

Remove TypeVariableOriginKind and ConstVariableOriginKind #123016

Remove TypeVariableOriginKind and ConstVariableOriginKind #123016

Conversation

compiler-errors commented Mar 24, 2024

rustbot commented Mar 24, 2024

This comment has been minimized.

bors commented Mar 28, 2024

lcnr left a comment

Choose a reason for hiding this comment

lcnr commented Apr 5, 2024

bors commented Apr 5, 2024

matthiaskrgr commented Apr 6, 2024

bors commented Apr 6, 2024

This comment has been minimized.

bors commented Apr 6, 2024

bors commented Apr 11, 2024

compiler-errors commented Apr 15, 2024

bors commented Apr 15, 2024

Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` #123016

Remove `TypeVariableOriginKind` and `ConstVariableOriginKind` #123016