Skip to content

resolve: Set correct parent and expansion for self declarations - #156353

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
petrochenkov:selfdecl
May 9, 2026
Merged

resolve: Set correct parent and expansion for self declarations#156353
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
petrochenkov:selfdecl

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented May 9, 2026

Copy link
Copy Markdown
Contributor

Follow up to #146972 and #154313.

The parent seems to not be used yet, it will ICE if used (#156185 uses it).
The expn_id is only relevant to macros 2.0, I won't bother coming up with a test.

@rustbotrustbot 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 May 9, 2026
@rustbot

rustbot commented May 9, 2026

Copy link
Copy Markdown
Collaborator

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
  • compiler expanded to 73 candidates
  • Random selection from 16 candidates

@petrochenkov

petrochenkov commented May 9, 2026

Copy link
Copy Markdown
ContributorAuthor

r? @mu001999

@petrochenkovpetrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 9, 2026
@petrochenkov

petrochenkov commented May 9, 2026

Copy link
Copy Markdown
ContributorAuthor

I'll stable-nominate as well, because #146972 is on stable, but this certainly doesn't deserve a point release.

@petrochenkovpetrochenkov added the stable-nominated Nominated for backporting to the compiler in the stable channel. label May 9, 2026
@mu001999

mu001999 commented May 9, 2026

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented May 9, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 16729bc has been approved by mu001999

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 9, 2026
@jieyouxu

jieyouxu commented May 9, 2026•
edited
Loading

Copy link
Copy Markdown
Member

The parent seems to not be used yet, it will ICE if used (#156185 uses it).

@petrochenkov am I understanding correctly that the backport nominations are largely to avoid the ICE?

@petrochenkov

petrochenkov commented May 9, 2026

Copy link
Copy Markdown
ContributorAuthor

The backport is mostly for the use of self_decl (#146972) and trivial fixes to it (#154313 and this PR) to go into the same release.

I'm not sure if the ICE can be triggered before #156185 is merged.
Maybe it's not so important to backport after all.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 9, 2026
@matthiaskrgr
Rollup merge ofrust-lang#156353- petrochenkov:selfdecl, r=mu001999
97b1cd0
resolve: Set correct parent and expansion for `self` declarations
Follow up to rust-lang#146972 and rust-lang#154313.
The `parent` seems to not be used yet, it will ICE if used (rust-lang#156185 uses it).
The `expn_id` is only relevant to macros 2.0, I won't bother coming up with a test.
@matthiaskrgrmatthiaskrgr mentioned this pull request May 9, 2026
Closed
@jhprattjhpratt mentioned this pull request May 9, 2026
Merged
rust-borsBot pushed a commit that referenced this pull request May 9, 2026
@bors
Auto merge of#156361- jhpratt:rollup-G3Jg88X, r=jhpratt
29155a4
Rollup of 5 pull requests
Successful merges:
- #156354 (Update example code of `std::array::from_fn`)
- #156359 (use `cfg_select!` in integer `{to, from}_{le, be}`)
- #156124 (Make stable hashing names consistent (part 2))
- #156235 (fix: Guard SizeSkeleton::compute against stack overflow)
- #156353 (resolve: Set correct parent and expansion for `self` declarations)
@rust-bors
rust-borsBot merged commit c32a2cd into rust-lang:mainMay 9, 2026
11 checks passed
@rustbotrustbot added this to the 1.97.0 milestone May 9, 2026
@rustbot

rustbot commented May 14, 2026

Copy link
Copy Markdown
Collaborator

beta backport approved as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels are handled by them.

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 14, 2026
@rustbot

rustbot commented May 14, 2026

Copy link
Copy Markdown
Collaborator

stable backport declined as per compiler team on Zulip.

@rustbotrustbot removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label May 14, 2026
@cuvipercuviper mentioned this pull request May 14, 2026
Merged
@cuvipercuviper modified the milestones: 1.97.0, 1.96.0May 14, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 14, 2026
rust-borsBot pushed a commit that referenced this pull request May 14, 2026
@bors
Auto merge of#156579- cuviper:beta-next, r=cuviper
1966c2d
[beta] backports
- resolve: Set correct parent and expansion for `self` declarations #156353
- Fix unused assignments in diverging branches #156425
r? cuviper
@petrochenkov
petrochenkov deleted the selfdecl branch June 17, 2026 14:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@mu001999mu001999

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

6 participants

@petrochenkov@rustbot@mu001999@jieyouxu@cuviper@dingxiangfei2009