`ty::Alias`: replace `def_id: did` with `def_id` by josetorrs · Pull Request #155063 · rust-lang/rust

josetorrs · 2026-04-09T19:47:21Z

View all comments

related issue: #154941

tackling this task:

replace def_id: did with def_id where possible

r? @WaffleLapkin

rustbot · 2026-04-09T19:47:26Z

WaffleLapkin is not on the review rotation at the moment.
They may take a while to respond.

rustbot · 2026-04-09T20:23:09Z

HIR ty lowering was modified

cc @fmease

WilliamTakeshi

Thanks for the contribution! Just a small feedback

View changes since this review

WilliamTakeshi · 2026-04-11T11:51:59Z

compiler/rustc_ty_utils/src/opaque_types.rs

            // Skips type aliases, as they are meant to be transparent.
            // FIXME(type_alias_impl_trait): can we require mentioning nested type aliases explicitly?
-            ty::Alias(alias_ty @ ty::AliasTy { kind: ty::Free { def_id }, .. })
+            ty::Alias(ty::AliasTy { kind: ty::Free { def_id }, args, .. })


I think the original issue calls for args: alias_ty_args. Using just args feels too broad.

updated this: 0efed12

WaffleLapkin · 2026-04-11T17:06:19Z

compiler/rustc_ty_utils/src/opaque_types.rs

+            ty::Alias(ty::AliasTy { kind: ty::Free { def_id }, args: alias_ty_args, .. })
                if let Some(def_id) = def_id.as_local() =>
            {
                if !self.seen.insert(def_id) {
                    return;
                }
-                self.tcx.type_of(def_id).instantiate(self.tcx, alias_ty.args).visit_with(self);
+                self.tcx.type_of(def_id).instantiate(self.tcx, alias_ty_args).visit_with(self);


View changes since the review

I would rather not split work of changing name @ ty::AliasTy per kind. #154941 already handles all of them (I think?) so please revert this.

rustbot · 2026-04-11T17:06:30Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

josetorrs · 2026-04-11T17:24:11Z

@rustbot ready

WaffleLapkin · 2026-04-11T17:26:31Z

@bors r+ rollup

rust-bors · 2026-04-11T17:26:35Z

📌 Commit e18f23b has been approved by WaffleLapkin

It is now in the queue for this repository.

WaffleLapkin · 2026-04-11T17:27:46Z

@bors r-

Actually, let's squash commits first.

WaffleLapkin · 2026-04-11T17:29:05Z

@bors squash msg=ty::Alias: replace def_id: did with def_id

rust-bors · 2026-04-11T17:29:25Z

🔨 4 commits were squashed into 53bf1ee.

WaffleLapkin · 2026-04-11T17:38:11Z

Hm. Let's try to set the commit message again...

@bors squash msg="ty::Alias: replace def_id: did with def_id"

rust-bors · 2026-04-11T17:38:15Z

❗ The PR has only one commit.

josetorrs · 2026-04-11T17:38:33Z

I think the backticks ( ` ) made the commit message a little odd

WaffleLapkin · 2026-04-11T17:44:35Z

@josetorrs since bors isn't cooperating could you try renaming the commit instead? ^^' (you need to fetch the commit that bors squashed first)

josetorrs · 2026-04-11T18:11:46Z

@WaffleLapkin should be good now

WaffleLapkin · 2026-04-11T18:24:08Z

@bors r+ rollup

rust-bors · 2026-04-11T18:24:13Z

📌 Commit ec582d5 has been approved by WaffleLapkin

It is now in the queue for this repository.

…uwer Rollup of 6 pull requests Successful merges: - #155057 (Update libc to v0.2.184) - #154967 (Test(lib/sync): Fix `test_rwlock_max_readers` for x86 Win7) - #154994 (don't leak internal temporaries from `dbg!`) - #155130 (Stabilize feature `isolate_most_least_significant_one`) - #154925 (Make Box/Rc/Arc::into_array allocator-aware (and add doctest)) - #155063 (`ty::Alias`: replace `def_id: did` with `def_id`)

@WaffleLapkin

Rollup merge of #155063 - josetorrs:refactor-alias-free, r=WaffleLapkin `ty::Alias`: replace `def_id: did` with `def_id` related issue: #154941 tackling this task: - [x] replace def_id: did with def_id where possible r? @WaffleLapkin

rustbot assigned WaffleLapkin Apr 9, 2026

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 9, 2026

josetorrs marked this pull request as ready for review April 9, 2026 20:23

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 9, 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 Apr 9, 2026

josetorrs mentioned this pull request Apr 11, 2026

tracking issue for ty::Alias refactor #154941

Open

7 tasks

WilliamTakeshi reviewed Apr 11, 2026

View reviewed changes

WilliamTakeshi approved these changes Apr 11, 2026

View reviewed changes

WaffleLapkin requested changes Apr 11, 2026

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 11, 2026

rustbot 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 Apr 11, 2026

WaffleLapkin changed the title ~~rename local parameter, refactor ty::Free~~ ty::Alias: replace def_id: did with def_id Apr 11, 2026

WaffleLapkin approved these changes Apr 11, 2026

View reviewed changes

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 Apr 11, 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 Apr 11, 2026

This comment has been minimized.

Sign in to view

rust-bors bot force-pushed the refactor-alias-free branch from e18f23b to 53bf1ee Compare April 11, 2026 17:29

replace def_id: did with def_id

ec582d5

josetorrs force-pushed the refactor-alias-free branch from 53bf1ee to ec582d5 Compare April 11, 2026 18:00

WaffleLapkin approved these changes Apr 11, 2026

View reviewed changes

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

JonathanBrouwer mentioned this pull request Apr 11, 2026

Rollup of 6 pull requests #155166

Merged

rust-bors bot merged commit 58ca4df into rust-lang:main Apr 12, 2026
11 checks passed

rustbot added this to the 1.97.0 milestone Apr 12, 2026

Uh oh!

Conversation

josetorrs commented Apr 9, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 9, 2026

Uh oh!

rustbot commented Apr 9, 2026

Uh oh!

WilliamTakeshi left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WilliamTakeshi Apr 11, 2026

Choose a reason for hiding this comment

Uh oh!

josetorrs Apr 11, 2026

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin Apr 11, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

josetorrs Apr 11, 2026

Choose a reason for hiding this comment

Uh oh!

rustbot commented Apr 11, 2026

Uh oh!

josetorrs commented Apr 11, 2026

Uh oh!

WaffleLapkin commented Apr 11, 2026

Uh oh!

rust-bors bot commented Apr 11, 2026

Uh oh!

WaffleLapkin commented Apr 11, 2026

Uh oh!

WaffleLapkin commented Apr 11, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Apr 11, 2026

Uh oh!

WaffleLapkin commented Apr 11, 2026

Uh oh!

rust-bors bot commented Apr 11, 2026

Uh oh!

josetorrs commented Apr 11, 2026

Uh oh!

WaffleLapkin commented Apr 11, 2026

Uh oh!

josetorrs commented Apr 11, 2026

Uh oh!

WaffleLapkin commented Apr 11, 2026

Uh oh!

rust-bors bot commented Apr 11, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

josetorrs commented Apr 9, 2026 •

edited by rustbot

Loading

WilliamTakeshi left a comment •

edited

Loading

WaffleLapkin Apr 11, 2026 •

edited by rustbot

Loading