Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup by fmease · Pull Request #125635 · rust-lang/rust

fmease · 2024-05-27T22:25:28Z

Rename hir::TypeBinding and ast::AssocConstraint to AssocItemConstraint and update all items and locals using the old terminology.

Motivation: The terminology type binding is extremely outdated. "Type bindings" not only include constraints on associated types but also on associated constants (feature associated_const_equality) and on RPITITs of associated functions (feature return_type_notation). Hence the word item in the new name. Furthermore, the word binding commonly refers to a mapping from a binder/identifier to a "value" for some definition of "value". Its use in "type binding" made sense when equality constraints (e.g., AssocTy = Ty) were the only kind of associated item constraint. Nowadays however, we also have associated type bounds (e.g., AssocTy: Bound) for which the term binding doesn't make sense.

Old terminology (HIR, rustdoc):

`TypeBinding`: (associated) type binding
├── `Constraint`: associated type bound
└── `Equality`: (associated) equality constraint (?)
    ├── `Ty`: (associated) type binding
    └── `Const`: associated const equality (constraint)

Old terminology (AST, abbrev.):

`AssocConstraint`
├── `Bound`
└── `Equality`
    ├── `Ty`
    └── `Const`

New terminology (AST, HIR, rustdoc):

`AssocItemConstraint`: associated item constraint
├── `Bound`: associated type bound
└── `Equality`: associated item equality constraint OR associated item binding (for short)
    ├── `Ty`: associated type equality constraint OR associated type binding (for short)
    └── `Const`: associated const equality constraint OR associated const binding (for short)

r? compiler-errors

compiler/rustc_ast/src/ast.rs

compiler/rustc_ast_lowering/src/path.rs

compiler/rustc_borrowck/src/diagnostics/region_name.rs

src/tools/clippy/clippy_lints/src/implied_bounds_in_impls.rs

rustbot · 2024-05-28T07:49:04Z

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

compiler-errors · 2024-05-30T22:50:02Z

@bors r+

bors · 2024-05-30T22:50:04Z

📌 Commit 34c56c4 has been approved by compiler-errors

It is now in the queue for this repository.

…constraint, r=compiler-errors Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup Rename `hir::TypeBinding` and `ast::AssocConstraint` to `AssocItemConstraint` and update all items and locals using the old terminology. Motivation: The terminology *type binding* is extremely outdated. "Type bindings" not only include constraints on associated *types* but also on associated *constants* (feature `associated_const_equality`) and on RPITITs of associated *functions* (feature `return_type_notation`). Hence the word *item* in the new name. Furthermore, the word *binding* commonly refers to a mapping from a binder/identifier to a "value" for some definition of "value". Its use in "type binding" made sense when equality constraints (e.g., `AssocTy = Ty`) were the only kind of associated item constraint. Nowadays however, we also have *associated type bounds* (e.g., `AssocTy: Bound`) for which the term *binding* doesn't make sense. --- Old terminology (HIR, rustdoc): ``` `TypeBinding`: (associated) type binding ├── `Constraint`: associated type bound └── `Equality`: (associated) equality constraint (?) ├── `Ty`: (associated) type binding └── `Const`: associated const equality (constraint) ``` Old terminology (AST, abbrev.): ``` `AssocConstraint` ├── `Bound` └── `Equality` ├── `Ty` └── `Const` ``` New terminology (AST, HIR, rustdoc): ``` `AssocItemConstraint`: associated item constraint ├── `Bound`: associated type bound └── `Equality`: associated item equality constraint OR associated item binding (for short) ├── `Ty`: associated type equality constraint OR associated type binding (for short) └── `Const`: associated const equality constraint OR associated const binding (for short) ``` r? compiler-errors

compiler/rustc_hir/src/hir.rs

fmease · 2024-05-30T23:25:41Z

CI takes too long, canceled.
@bors r-

fmease · 2024-05-31T00:37:22Z

#115105 (comment) / https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/x86_64-gnu-llvm-17.20job.20being.20really.20slow

@bors r=compiler-errors

bors · 2024-05-31T00:37:24Z

📌 Commit 34c56c4 has been approved by compiler-errors

It is now in the queue for this repository.

…constraint, r=compiler-errors Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup Rename `hir::TypeBinding` and `ast::AssocConstraint` to `AssocItemConstraint` and update all items and locals using the old terminology. Motivation: The terminology *type binding* is extremely outdated. "Type bindings" not only include constraints on associated *types* but also on associated *constants* (feature `associated_const_equality`) and on RPITITs of associated *functions* (feature `return_type_notation`). Hence the word *item* in the new name. Furthermore, the word *binding* commonly refers to a mapping from a binder/identifier to a "value" for some definition of "value". Its use in "type binding" made sense when equality constraints (e.g., `AssocTy = Ty`) were the only kind of associated item constraint. Nowadays however, we also have *associated type bounds* (e.g., `AssocTy: Bound`) for which the term *binding* doesn't make sense. --- Old terminology (HIR, rustdoc): ``` `TypeBinding`: (associated) type binding ├── `Constraint`: associated type bound └── `Equality`: (associated) equality constraint (?) ├── `Ty`: (associated) type binding └── `Const`: associated const equality (constraint) ``` Old terminology (AST, abbrev.): ``` `AssocConstraint` ├── `Bound` └── `Equality` ├── `Ty` └── `Const` ``` New terminology (AST, HIR, rustdoc): ``` `AssocItemConstraint`: associated item constraint ├── `Bound`: associated type bound └── `Equality`: associated item equality constraint OR associated item binding (for short) ├── `Ty`: associated type equality constraint OR associated type binding (for short) └── `Const`: associated const equality constraint OR associated const binding (for short) ``` r? compiler-errors

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#125635 (Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup) - rust-lang#125774 (Avoid unwrap diag.code directly in note_and_explain_type_err) - rust-lang#125786 (Fold item bounds before proving them in `check_type_bounds` in new solver) - rust-lang#125790 (Don't recompute `tail` in `lower_stmts`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125635 - fmease:mv-type-binding-assoc-item-constraint, r=compiler-errors Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup Rename `hir::TypeBinding` and `ast::AssocConstraint` to `AssocItemConstraint` and update all items and locals using the old terminology. Motivation: The terminology *type binding* is extremely outdated. "Type bindings" not only include constraints on associated *types* but also on associated *constants* (feature `associated_const_equality`) and on RPITITs of associated *functions* (feature `return_type_notation`). Hence the word *item* in the new name. Furthermore, the word *binding* commonly refers to a mapping from a binder/identifier to a "value" for some definition of "value". Its use in "type binding" made sense when equality constraints (e.g., `AssocTy = Ty`) were the only kind of associated item constraint. Nowadays however, we also have *associated type bounds* (e.g., `AssocTy: Bound`) for which the term *binding* doesn't make sense. --- Old terminology (HIR, rustdoc): ``` `TypeBinding`: (associated) type binding ├── `Constraint`: associated type bound └── `Equality`: (associated) equality constraint (?) ├── `Ty`: (associated) type binding └── `Const`: associated const equality (constraint) ``` Old terminology (AST, abbrev.): ``` `AssocConstraint` ├── `Bound` └── `Equality` ├── `Ty` └── `Const` ``` New terminology (AST, HIR, rustdoc): ``` `AssocItemConstraint`: associated item constraint ├── `Bound`: associated type bound └── `Equality`: associated item equality constraint OR associated item binding (for short) ├── `Ty`: associated type equality constraint OR associated type binding (for short) └── `Const`: associated const equality constraint OR associated const binding (for short) ``` r? compiler-errors

bors · 2024-05-31T10:53:18Z

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

fmease · 2024-05-31T12:29:35Z

lol, how come an old version of this PR got merged??? I bors-reapproved the changes after the latest force-push. I h*te old bors

fmease · 2024-05-31T12:47:51Z

I guess it'd be the best to just close this PR then instead of rebasing onto the lastest master as it would render the diff a two-line fmt change to the clippy subtree. That wouldn't helpful be at all for posterity

fmease · 2024-05-31T12:49:05Z

Dear posterity, this PR has effectively been merged

…constraint, r=compiler-errors Rename HIR `TypeBinding` to `AssocItemConstraint` and related cleanup Rename `hir::TypeBinding` and `ast::AssocConstraint` to `AssocItemConstraint` and update all items and locals using the old terminology. Motivation: The terminology *type binding* is extremely outdated. "Type bindings" not only include constraints on associated *types* but also on associated *constants* (feature `associated_const_equality`) and on RPITITs of associated *functions* (feature `return_type_notation`). Hence the word *item* in the new name. Furthermore, the word *binding* commonly refers to a mapping from a binder/identifier to a "value" for some definition of "value". Its use in "type binding" made sense when equality constraints (e.g., `AssocTy = Ty`) were the only kind of associated item constraint. Nowadays however, we also have *associated type bounds* (e.g., `AssocTy: Bound`) for which the term *binding* doesn't make sense. --- Old terminology (HIR, rustdoc): ``` `TypeBinding`: (associated) type binding ├── `Constraint`: associated type bound └── `Equality`: (associated) equality constraint (?) ├── `Ty`: (associated) type binding └── `Const`: associated const equality (constraint) ``` Old terminology (AST, abbrev.): ``` `AssocConstraint` ├── `Bound` └── `Equality` ├── `Ty` └── `Const` ``` New terminology (AST, HIR, rustdoc): ``` `AssocItemConstraint`: associated item constraint ├── `Bound`: associated type bound └── `Equality`: associated item equality constraint OR associated item binding (for short) ├── `Ty`: associated type equality constraint OR associated type binding (for short) └── `Const`: associated const equality constraint OR associated const binding (for short) ``` r? compiler-errors

fmease added C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 27, 2024

rustbot assigned compiler-errors May 27, 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 27, 2024

fmease removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2024

fmease commented May 27, 2024

View reviewed changes

compiler/rustc_ast/src/ast.rs Outdated Show resolved Hide resolved

fmease commented May 27, 2024

View reviewed changes

compiler/rustc_ast_lowering/src/path.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

fmease commented May 27, 2024

View reviewed changes

compiler/rustc_borrowck/src/diagnostics/region_name.rs Outdated Show resolved Hide resolved

fmease commented May 27, 2024

View reviewed changes

src/tools/clippy/clippy_lints/src/implied_bounds_in_impls.rs Outdated Show resolved Hide resolved

fmease force-pushed the mv-type-binding-assoc-item-constraint branch from d5fdc9c to 06b28ed Compare May 28, 2024 01:11

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label May 28, 2024

fmease removed the A-rustdoc-json Area: Rustdoc JSON backend label May 28, 2024

This comment has been minimized.

Sign in to view

fmease force-pushed the mv-type-binding-assoc-item-constraint branch from 06b28ed to 68bc049 Compare May 28, 2024 07:14

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label May 28, 2024

fmease removed the A-rustdoc-json Area: Rustdoc JSON backend label May 28, 2024

This comment has been minimized.

Sign in to view

fmease force-pushed the mv-type-binding-assoc-item-constraint branch from 68bc049 to 6807342 Compare May 28, 2024 07:43

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label May 28, 2024

fmease removed the A-rustdoc-json Area: Rustdoc JSON backend label May 28, 2024

fmease changed the title ~~[WIP] Rename HIR TypeBinding to AssocItemConstraint and related cleanup~~ Rename HIR TypeBinding to AssocItemConstraint and related cleanup May 28, 2024

fmease marked this pull request as ready for review May 28, 2024 07:49

fmease 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 May 28, 2024

This comment has been minimized.

Sign in to view

fmease force-pushed the mv-type-binding-assoc-item-constraint branch from 6807342 to bcdda03 Compare May 28, 2024 08:02

fmease added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 30, 2024

compiler-errors approved these changes May 30, 2024

View reviewed changes

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 May 30, 2024

fmease mentioned this pull request May 30, 2024

Rollup of 4 pull requests #125791

Closed

fmease commented May 30, 2024

View reviewed changes

compiler/rustc_hir/src/hir.rs Show resolved Hide resolved

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2024

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 31, 2024

matthiaskrgr mentioned this pull request May 31, 2024

Rollup of 4 pull requests #125797

Merged

matthiaskrgr mentioned this pull request May 31, 2024

Rollup of 5 pull requests #125812

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 31, 2024

fmease closed this May 31, 2024

fmease deleted the mv-type-binding-assoc-item-constraint branch May 31, 2024 12:48

Uh oh!

Conversation

fmease commented May 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented May 28, 2024

Uh oh!

This comment has been minimized.

compiler-errors commented May 30, 2024

Uh oh!

bors commented May 30, 2024

Uh oh!

Uh oh!

fmease commented May 30, 2024

Uh oh!

fmease commented May 31, 2024

Uh oh!

bors commented May 31, 2024

Uh oh!

bors commented May 31, 2024

Uh oh!

fmease commented May 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmease commented May 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmease commented May 31, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fmease commented May 27, 2024 •

edited

Loading

fmease commented May 31, 2024 •

edited

Loading

fmease commented May 31, 2024 •

edited

Loading