move rustc_type_ir Term things to term_kind.rs by khyperia · Pull Request #157419 · rust-lang/rust

khyperia · 2026-06-04T08:50:55Z

TyKind, AliasTy, and AliasTyKind live in ty_kind.rs
ConstKind, UnevaluatedConst, and UnevaluatedConstKind live in const_kind.rs
TermKind, AliasTerm, and AliasTermKind live in... generic_arg.rs and predicate.rs ???

create a new file, term_kind.rs, that holds TermKind, AliasTerm, and AliasTermKind

(note that Ty, Const, and Term live in rustc_middle, not rustc_type_ir)

rustbot · 2026-06-04T08:51:00Z

r? @dingxiangfei2009

rustbot has assigned @dingxiangfei2009.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler, types
compiler, types expanded to 73 candidates
Random selection from 18 candidates

Jamesbarford · 2026-06-10T07:53:49Z

This looks like there is quite a lot of overlap with; #156538 ?

khyperia · 2026-06-10T07:58:52Z

This looks like there is quite a lot of overlap with; #156538 ?

True - feel free to integrate this change with your PR (i.e. moving TermKind/AliasTermKind to term_kind.rs). Otherwise I can wait until your PR lands and rebase this one on that, totally fine either way!

khyperia · 2026-06-20T14:01:29Z

I asked boxy to take a look at this since it's been two weeks since the initial reviewer assignment (@dingxiangfei2009 feel free to still review this if you're around!)

r? @BoxyUwU

rustbot · 2026-06-20T14:01:34Z

BoxyUwU is currently at their maximum review capacity.
They may take a while to respond.

BoxyUwU · 2026-06-23T08:55:18Z

@bors r+

rust-bors · 2026-06-23T08:55:21Z

📌 Commit 7507fff has been approved by BoxyUwU

It is now in the queue for this repository.

khyperia · 2026-06-23T08:57:48Z

ough, this'll merge conflict with #158013 (I'd prefer that one to merge first too, but you r+'d that one first so hopefully it's higher prio).

Should/could we pause this in the queue until that's merged?

BoxyUwU · 2026-06-23T09:33:56Z

@bors r-
@bors delegate+

rust-bors · 2026-06-23T09:34:01Z

This pull request was unapproved.

View changes since this unapproval

rust-bors · 2026-06-23T09:34:01Z

✌️ @khyperia, you can now approve this pull request!

If @BoxyUwU told you to "r=me" after making some further change, then please make that change and post @bors r=BoxyUwU.

View changes since this delegation.

rustbot · 2026-06-24T04:23:02Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

rust-log-analyzer · 2026-06-24T04:25:31Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

  IMAGE: x86_64-gnu-gcc-core-tests
##[endgroup]
    Updating crates.io index
error: failed to get `simd-adler32` as a dependency of package `miniz_oxide v0.8.8`
    ... which satisfies dependency `miniz_oxide = "^0.8.5"` of package `flate2 v1.1.9`
    ... which satisfies dependency `flate2 = "^1.1.9"` of package `citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)`

Caused by:
  failed to load source for dependency `simd-adler32`

Caused by:

khyperia · 2026-06-24T04:28:13Z

bogus CI failure, closing and reopening to retrigger

Caused by:
  curl failed

Caused by:
  [16] Error in the HTTP2 framing layer (Send failure: Connection reset by peer)

khyperia · 2026-06-24T04:30:26Z

@bors r=BoxyUwU

boxy previously r+'d this but unapproved due to future merge conflicts. the merge conflict resolution rebase range-diff is completely empty so should be all good now! :3

rust-bors · 2026-06-24T04:30:29Z

📌 Commit c0ea87e has been approved by BoxyUwU

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

move rustc_type_ir Term things to term_kind.rs - `TyKind`, `AliasTy`, and `AliasTyKind` live in `ty_kind.rs` - `ConstKind`, [`UnevaluatedConst`, and `UnevaluatedConstKind`](rust-lang/project-const-generics#115) live in `const_kind.rs` - `TermKind`, `AliasTerm`, and `AliasTermKind` live in... `generic_arg.rs` and `predicate.rs` ??? create a new file, `term_kind.rs`, that holds `TermKind`, `AliasTerm`, and `AliasTermKind` (note that `Ty`, `Const`, and `Term` live in `rustc_middle`, not `rustc_type_ir`)

Rollup of 35 pull requests Successful merges: - #158315 (`rust-analyzer` subtree update) - #158336 (Stop excluding `stdarch` test crates from `rust-src`) - #155739 (Add temporary scope to assert_eq and assert_ne) - #156885 (Fix misattributed type inference error span for index expressions) - #157271 (simplify some `proc_macro` things) - #157419 (move rustc_type_ir Term things to term_kind.rs) - #157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - #157921 (trait solver: Resolve region vars in max universe) - #157960 (delegation: add support for infers in generics) - #157983 (Lift the same-signature restriction for `extern "tail"`) - #158053 (Optimize network address parser) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158279 (Follow goto and drop when linting unreachable code) - #157527 (Move derive tests into their dedicated folder) - #157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - #157939 (Reorganize `tests/ui/issues` [8/N]) - #157946 (Make `char::is_private_use` and `char::is_assigned` unstably public) - #158003 (Reorganize `tests/ui/issues` [9/N]) - #158020 (Update mingw-w64 C toolchain) - #158039 (c-variadic: test that we use equality up to free lifetimes) - #158060 (Reorganize `tests/ui/issues` [10/N]) - #158222 (format: ignore println newline in foreign format hints) - #158223 (Move target checking for #[lang] to the attribute parser) - #158252 (Use `cfg_select` in `std::os`) - #158263 (Only load the feature list once in the entire resolver) - #158267 (FromUtf8Error::into_utf8_lossy better example and suggest use) - #158272 (Reorganize `tests/ui/issues` [13/N]) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note) - #158300 (Improve unknown crate_type diagnostic suggestions) - #158304 (mailmap: update mu001999) - #158309 (Update `rustc-literal-escaper` version to `0.0.8`) - #158314 (Fix incorrect unsafe debug assertion in unchecked_div_exact) - #158326 (Add `io::ErrorKind::TooManyOpenFiles`)

rustbot assigned dingxiangfei2009 Jun 4, 2026

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 Jun 4, 2026

This comment has been minimized.

Sign in to view

khyperia force-pushed the term_kind_rs branch from 23ad71c to 3144f06 Compare June 13, 2026 12:31

This comment has been minimized.

Sign in to view

khyperia force-pushed the term_kind_rs branch from 3144f06 to 7507fff Compare June 17, 2026 04:40

This comment has been minimized.

Sign in to view

rustbot assigned BoxyUwU and unassigned dingxiangfei2009 Jun 20, 2026

rust-bors Bot 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 Jun 23, 2026

rust-bors Bot 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 Jun 23, 2026

This comment has been minimized.

Sign in to view

move rustc_type_ir Term things to term_kind.rs

c0ea87e

khyperia force-pushed the term_kind_rs branch from 7507fff to c0ea87e Compare June 24, 2026 04:22

khyperia closed this Jun 24, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 24, 2026

khyperia reopened this Jun 24, 2026

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 24, 2026

rust-bors Bot 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 Jun 24, 2026

jhpratt mentioned this pull request Jun 24, 2026

Rollup of 35 pull requests #158342

Open

Uh oh!

Conversation

khyperia commented Jun 4, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 4, 2026

Uh oh!

Jamesbarford commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

khyperia commented Jun 10, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

khyperia commented Jun 20, 2026

Uh oh!

rustbot commented Jun 20, 2026

Uh oh!

BoxyUwU commented Jun 23, 2026

Uh oh!

rust-bors Bot commented Jun 23, 2026

Uh oh!

khyperia commented Jun 23, 2026

Uh oh!

BoxyUwU commented Jun 23, 2026

Uh oh!

rust-bors Bot commented Jun 23, 2026

Uh oh!

rust-bors Bot commented Jun 23, 2026

Uh oh!

This comment has been minimized.

rustbot commented Jun 24, 2026

Uh oh!

rust-log-analyzer commented Jun 24, 2026

Uh oh!

khyperia commented Jun 24, 2026

Uh oh!

khyperia commented Jun 24, 2026

Uh oh!

rust-bors Bot commented Jun 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

khyperia commented Jun 4, 2026 •

edited by rustbot

Loading

Jamesbarford commented Jun 10, 2026 •

edited

Loading