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.

@rustbot

This comment has been minimized.

@rust-bors

This comment was marked as resolved.

@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.

@rustbot

This comment has been minimized.

@petrochenkov
Copy link
Contributor Author

@bors r=nnethercote

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 13, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 13, 2026

📌 Commit cd95781 has been approved by nnethercote

It is now in the queue for this repository.

@rust-bors rust-bors bot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 13, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 13, 2026
resolve: Refactor away the side table `decl_parent_modules`

Instead keep parent modules in `DeclData` itself.
Follow up to rust-lang#150445.

r? @nnethercote
@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

This comment was marked as resolved.

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

rustbot commented Jan 13, 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.

@petrochenkov
Copy link
Contributor Author

@bors r=nnethercote

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 13, 2026

📌 Commit c4820e6 has been approved by nnethercote

It is now in the queue for this repository.

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 14, 2026
resolve: Refactor away the side table `decl_parent_modules`

Instead keep parent modules in `DeclData` itself.
Follow up to rust-lang#150445.

r? @nnethercote
rust-bors bot pushed a commit that referenced this pull request Jan 14, 2026
…uwer

Rollup of 12 pull requests

Successful merges:

 - #149408 (refactor: remove Ord bound from BinaryHeap::new etc)
 - #150406 (Change some `matches!(.., .. if ..)` with let-chains)
 - #150723 (std: move `errno` and related functions into `sys::io`)
 - #150877 (resolve: Refactor away the side table `decl_parent_modules`)
 - #150902 (Update to_uppercase docs to avoid ß->SS example)
 - #150962 (Remove `FeedConstTy` and provide ty when lowering const arg)
 - #151034 (std: Change UEFI env vars to volatile storage)
 - #151036 (Better handle when trying to iterate on a `Range` of a type that isn't `Step`)
 - #151067 (Avoid should-fail in two ui tests and a codegen-llvm test)
 - #151072 (also handle ENOTTY ioctl errors when checking pidfd -> pid support)
 - #151077 (Recognize potential `impl<const N: usize>` to `impl<N>` mistake)
 - #151096 (Remove `Deref`/`DerefMut` impl for `Providers`.)

Failed merges:

 - #150939 (resolve: Relax some asserts in glob overwriting and add tests)

r? @ghost
rust-bors bot pushed a commit that referenced this pull request Jan 14, 2026
…uwer

Rollup of 11 pull requests

Successful merges:

 - #149408 (refactor: remove Ord bound from BinaryHeap::new etc)
 - #150406 (Change some `matches!(.., .. if ..)` with let-chains)
 - #150723 (std: move `errno` and related functions into `sys::io`)
 - #150877 (resolve: Refactor away the side table `decl_parent_modules`)
 - #150902 (Update to_uppercase docs to avoid ß->SS example)
 - #151034 (std: Change UEFI env vars to volatile storage)
 - #151036 (Better handle when trying to iterate on a `Range` of a type that isn't `Step`)
 - #151067 (Avoid should-fail in two ui tests and a codegen-llvm test)
 - #151072 (also handle ENOTTY ioctl errors when checking pidfd -> pid support)
 - #151077 (Recognize potential `impl<const N: usize>` to `impl<N>` mistake)
 - #151096 (Remove `Deref`/`DerefMut` impl for `Providers`.)

Failed merges:

 - #150939 (resolve: Relax some asserts in glob overwriting and add tests)

r? @ghost
@rust-bors rust-bors bot merged commit 129f88c into rust-lang:main Jan 14, 2026
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 14, 2026
rust-timer added a commit that referenced this pull request Jan 14, 2026
Rollup merge of #150877 - declmod, r=nnethercote

resolve: Refactor away the side table `decl_parent_modules`

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

r? @nnethercote
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jan 15, 2026
…uwer

Rollup of 11 pull requests

Successful merges:

 - rust-lang/rust#149408 (refactor: remove Ord bound from BinaryHeap::new etc)
 - rust-lang/rust#150406 (Change some `matches!(.., .. if ..)` with let-chains)
 - rust-lang/rust#150723 (std: move `errno` and related functions into `sys::io`)
 - rust-lang/rust#150877 (resolve: Refactor away the side table `decl_parent_modules`)
 - rust-lang/rust#150902 (Update to_uppercase docs to avoid ß->SS example)
 - rust-lang/rust#151034 (std: Change UEFI env vars to volatile storage)
 - rust-lang/rust#151036 (Better handle when trying to iterate on a `Range` of a type that isn't `Step`)
 - rust-lang/rust#151067 (Avoid should-fail in two ui tests and a codegen-llvm test)
 - rust-lang/rust#151072 (also handle ENOTTY ioctl errors when checking pidfd -> pid support)
 - rust-lang/rust#151077 (Recognize potential `impl<const N: usize>` to `impl<N>` mistake)
 - rust-lang/rust#151096 (Remove `Deref`/`DerefMut` impl for `Providers`.)

Failed merges:

 - rust-lang/rust#150939 (resolve: Relax some asserts in glob overwriting and add tests)

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

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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