Rename subst::Kind to subst::GenericArg

[varkor]

And subst::UnpackedKind to subst::GenericArgKind. Individual variable names (e.g. kind) are not renamed, which would be an infeasible mission.

Fixes #64352.

r? @eddyb

[oli-obk]

r? @eternaleye

it would be best if the name bikeshed ended without containing Kind at all

[eddyb]

At this point I'd be happy with a weird name like TyLtOrCt where it's really easy to explain what the name means that we can rename later to something prettier.

I believe @eternaleye explained to me why both "kind" and "term" don't work well for this, and it's more damning due to Rust not being dependently-typed.
@oli-obk or I could look for the exact quote if that's wanted.

[varkor]

I believe @eternaleye explained to me why both "kind" and "term" don't work well for this, and it's more damning due to Rust not being dependently-typed.

I think we already established that neither was ideal, which is why this is a more long-winded name, but I'd be interested in hearing their justification too.

At this point I'd be happy with a weird name like TyLtOrCt where it's really easy to explain what the name means that we can rename later to something prettier.

Maybe...

[varkor]

I've renamed Kind to GenericArg, following @eddyb's suggestion in #64352 (comment).

[oli-obk]

@bors r+ p=1 bitrotty

[bors]

📌 Commit 4788e7d6c369ad17306ebd42b555dc997450a16a has been approved by oli-obk

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout kindedterm (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self kindedterm --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/librustdoc/clean/mod.rs
CONFLICT (content): Merge conflict in src/librustdoc/clean/mod.rs
Auto-merging src/librustc_typeck/variance/constraints.rs
Auto-merging src/librustc_typeck/outlives/implicit_infer.rs
Auto-merging src/librustc_typeck/collect.rs
CONFLICT (content): Merge conflict in src/librustc_typeck/collect.rs
Auto-merging src/librustc_typeck/check/wfcheck.rs
CONFLICT (content): Merge conflict in src/librustc_typeck/check/wfcheck.rs
Auto-merging src/librustc_typeck/check/regionck.rs
Auto-merging src/librustc_typeck/check/pat.rs
Auto-merging src/librustc_typeck/check/mod.rs
Auto-merging src/librustc_typeck/check/dropck.rs
Auto-merging src/librustc_typeck/astconv.rs
Auto-merging src/librustc_traits/chalk_context/resolvent_ops.rs
Auto-merging src/librustc_traits/chalk_context/program_clauses/builtin.rs
Auto-merging src/librustc_traits/chalk_context/mod.rs
CONFLICT (content): Merge conflict in src/librustc_traits/chalk_context/mod.rs
Auto-merging src/librustc_mir/interpret/intrinsics/type_name.rs
Auto-merging src/librustc_mir/hair/pattern/mod.rs
Auto-merging src/librustc_mir/borrow_check/nll/type_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs
Auto-merging src/librustc_codegen_utils/symbol_names/v0.rs
Auto-merging src/librustc_codegen_utils/symbol_names/legacy.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/mod.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/metadata.rs
Auto-merging src/librustc/ty/util.rs
CONFLICT (content): Merge conflict in src/librustc/ty/util.rs
Auto-merging src/librustc/ty/subst.rs
Auto-merging src/librustc/ty/sty.rs
Auto-merging src/librustc/ty/relate.rs
Auto-merging src/librustc/ty/print/pretty.rs
Auto-merging src/librustc/ty/print/mod.rs
Auto-merging src/librustc/ty/context.rs
CONFLICT (content): Merge conflict in src/librustc/ty/context.rs
Auto-merging src/librustc/traits/query/dropck_outlives.rs
Auto-merging src/librustc/lint/context.rs
Auto-merging src/librustc/infer/outlives/obligations.rs
Auto-merging src/librustc/infer/opaque_types/mod.rs
Auto-merging src/librustc/infer/nll_relate/mod.rs
Auto-merging src/librustc/infer/mod.rs
Auto-merging src/librustc/infer/error_reporting/mod.rs
Auto-merging src/librustc/infer/canonical/query_response.rs
Auto-merging src/librustc/infer/canonical/canonicalizer.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[varkor]

@bors r=oli-obk

[bors]

📌 Commit e3fb05d has been approved by oli-obk

[bors]

⌛ Testing commit e3fb05d with merge ddf4386...

[bors]

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing ddf4386 to master...

[RalfJung]

Thanks a lot :)