Skip to content

Conversation

@petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Jan 9, 2026

Instead keep parent modules in DeclData itself.
Follow up to #150445.

r? @nnethercote

@rustbot 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 Jan 9, 2026
@rust-bors

This comment was marked as resolved.

@petrochenkov
Copy link
Contributor Author

petrochenkov commented Jan 10, 2026

I think I'll remove the second commit after rebasing.
The new logic is also not always correct, and it's not strictly more correct than the old one, so let's just keep the current logic.
I need to think what exactly conditions we want there.
Upd: second commit removed.

Instead keep parent modules in `DeclData` itself
@rustbot
Copy link
Collaborator

rustbot commented Jan 11, 2026

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-bors
Copy link
Contributor

rust-bors bot commented Jan 11, 2026

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

@nnethercote
Copy link
Contributor

@bors r+

@rust-bors 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 Jan 12, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 12, 2026

📌 Commit 381c425 has been approved by nnethercote

It is now in the queue for this repository.

@jieyouxu
Copy link
Member

(Unfortunately has merge conflicts)
@bors r-

@rust-bors 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 Jan 13, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 13, 2026

Commit 381c425 has been unapproved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants