Refactor resolve resolution bindings #143734

LorrensP-2158466 · 2025-07-10T13:47:43Z

This pr does the work asked in #142547 (comment). This part:

move the (non)_glob_binding change

LorrensP-2158466 · 2025-07-10T13:54:22Z

Had to fix the conflicts in the tests from the ambiguous_glob_imports pr. The author is different in that commit, should I change it?

b-naber · 2025-07-10T14:54:55Z

Had to fix the conflicts in the tests from the ambiguous_glob_imports pr. The author is different in that commit, should I change it?

No it's fine. Thanks for the PRs.

tests/ui/imports/ambiguous-17.rs

tests/ui/imports/issue-56125.rs

tests/ui/resolve/issue-107563-ambiguous-glob-reexports.rs

compiler/rustc_resolve/src/imports.rs

compiler/rustc_resolve/src/ident.rs

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-07-10T19:19:05Z

So I kept the exact changes from b-naber as exact as possible, so I think most of these reviews are related to their changes. Should the "address review" commit be authored by them as well? Or doesn't this matter because the commits will probably be squashed?

b-naber · 2025-07-10T19:37:07Z

I'll address the review either tomorrow or on the weekend. Can you give me write access to your branch?

LorrensP-2158466 · 2025-07-10T19:39:27Z

Yes! So i shouldn't address them or?

b-naber · 2025-07-10T19:41:42Z

No, you can if you want to of course. It would just take some time to read into the logic of the code, but if you want to do that, feel free to address the review.

LorrensP-2158466 · 2025-07-10T19:45:23Z

Alright! I'll see what I can do today. I didn't find anything on branch-specific access, so I just added you to my fork.

LorrensP-2158466 · 2025-07-10T22:56:52Z

So, sorry, I didn't have much time and am pretty tired :). I only address the simple requests from Vadim.

Let me know if you'd like to take the actual logic changes. I'm perfectly fine doing them myself since it's good to learn the resolution process for my project. But I understand if you want this to go a little faster.

I should be able to finish this before the weekend is over, but I'm not sure, of course. :)

petrochenkov · 2025-07-11T06:15:18Z

since it's good to learn the resolution process for my project

Yeah, that's pretty much was the idea, getting experience doing something practical before going to harder refactorings needed for import parallelization.

b-naber · 2025-07-11T06:59:52Z

So, sorry, I didn't have much time and am pretty tired :). I only address the simple requests from Vadim.

Let me know if you'd like to take the actual logic changes. I'm perfectly fine doing them myself since it's good to learn the resolution process for my project. But I understand if you want this to go a little faster.

I should be able to finish this before the weekend is over, but I'm not sure, of course. :)

No it's fine, I can wait until you've addressed the review.

LorrensP-2158466 · 2025-07-11T09:09:08Z

So I edited the first commit to not introduce the faulty use of late_binding and changed the big diff in try_define to what it was before.

Then 2 extra commits (which should have been squashed, sorry), which address the rest of the review.

revert tests reverts the tests to what they were before because the changes of the first commit now failed with b-naber's changes.

compiler/rustc_resolve/src/ident.rs

LorrensP-2158466 · 2025-07-11T09:28:55Z

@rustbot ready

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-07-11T10:37:49Z

@rustbot author

rustbot · 2025-07-11T10:37:53Z

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

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-07-11T21:00:42Z

@rustbot ready

petrochenkov · 2025-07-12T09:16:44Z

Thanks!
r=me after squashing commits.
@rustbot author

…ding and glob_binding

LorrensP-2158466 · 2025-07-12T13:07:28Z

I do not understand what you mean by r=me.
Second force push is because I forgot to set b-naber as author.

@rustbot ready

petrochenkov · 2025-07-12T14:22:32Z

I do not understand what you mean by r=me.

https://rustc-dev-guide.rust-lang.org/walkthrough.html?highlight=r%3Dme#implementation

@bors r+

bors · 2025-07-12T14:22:34Z

📌 Commit 9ed5378 has been approved by petrochenkov

It is now in the queue for this repository.

…resolution-bindings, r=petrochenkov Refactor resolve resolution bindings This pr does the work asked in rust-lang#142547 (comment). This part: > move the `(non)_glob_binding` change r? `@petrochenkov`

Rollup of 14 pull requests Successful merges: - #143301 (`tests/ui`: A New Order [26/N]) - #143461 (make `cfg_select` a builtin macro) - #143519 (Check assoc consts and tys later like assoc fns) - #143554 (slice: Mark `rotate_left`, `rotate_right` unstably const) - #143634 (interpret/allocation: expose init + write_wildcards on a range) - #143679 (Preserve the .debug_gdb_scripts section) - #143685 (Resolve: merge `source_bindings` and `target_bindings` into `bindings`) - #143704 (Be a bit more careful around exotic cycles in in the inliner) - #143734 (Refactor resolve resolution bindings) - #143774 (constify `From` and `Into`) - #143785 (Add --compile-time-deps argument for x check) - #143786 (Fix fallback for CI_JOB_NAME) - #143825 (clippy: fix test filtering when TESTNAME is empty) - #143826 (Fix command trace) r? `@ghost` `@rustbot` modify labels: rollup

…resolution-bindings, r=petrochenkov Refactor resolve resolution bindings This pr does the work asked in rust-lang#142547 (comment). This part: > move the `(non)_glob_binding` change r? ``@petrochenkov``

Rollup of 13 pull requests Successful merges: - #143301 (`tests/ui`: A New Order [26/N]) - #143461 (make `cfg_select` a builtin macro) - #143519 (Check assoc consts and tys later like assoc fns) - #143554 (slice: Mark `rotate_left`, `rotate_right` unstably const) - #143634 (interpret/allocation: expose init + write_wildcards on a range) - #143679 (Preserve the .debug_gdb_scripts section) - #143685 (Resolve: merge `source_bindings` and `target_bindings` into `bindings`) - #143734 (Refactor resolve resolution bindings) - #143774 (constify `From` and `Into`) - #143785 (Add --compile-time-deps argument for x check) - #143786 (Fix fallback for CI_JOB_NAME) - #143825 (clippy: fix test filtering when TESTNAME is empty) - #143826 (Fix command trace) r? `@ghost` `@rustbot` modify labels: rollup

…resolution-bindings, r=petrochenkov Refactor resolve resolution bindings This pr does the work asked in rust-lang#142547 (comment). This part: > move the `(non)_glob_binding` change r? ```@petrochenkov```

…resolution-bindings, r=petrochenkov Refactor resolve resolution bindings This pr does the work asked in rust-lang#142547 (comment). This part: > move the `(non)_glob_binding` change r? ````@petrochenkov````

rustbot assigned petrochenkov Jul 10, 2025

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 Jul 10, 2025

LorrensP-2158466 force-pushed the refactor-resolve-resolution-bindings branch from bc863d6 to 9c91fb1 Compare July 10, 2025 13:52

petrochenkov reviewed Jul 10, 2025

View reviewed changes

petrochenkov 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 Jul 10, 2025

This comment was marked as resolved.

Sign in to view

LorrensP-2158466 force-pushed the refactor-resolve-resolution-bindings branch from 1fe68dc to dd5c2bb Compare July 11, 2025 09:06

LorrensP-2158466 commented Jul 11, 2025

View reviewed changes

compiler/rustc_resolve/src/ident.rs Outdated Show resolved Hide resolved

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 Jul 11, 2025

b-naber reviewed Jul 11, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

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 Jul 11, 2025

LorrensP-2158466 commented Jul 11, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

petrochenkov 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 Jul 11, 2025

b-naber reviewed Jul 11, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

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 Jul 11, 2025

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 Jul 12, 2025

LorrensP-2158466 force-pushed the refactor-resolve-resolution-bindings branch from d500de6 to 4b221e0 Compare July 12, 2025 13:05

replace binding and shadowed_glob on NameResolution with non_glob_bin…

9ed5378

…ding and glob_binding

LorrensP-2158466 force-pushed the refactor-resolve-resolution-bindings branch from 4b221e0 to 9ed5378 Compare July 12, 2025 13:06

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 Jul 12, 2025

bors 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 Jul 12, 2025

fmease mentioned this pull request Jul 13, 2025

Rollup of 14 pull requests #143866

Closed

matthiaskrgr mentioned this pull request Jul 13, 2025

Rollup of 13 pull requests #143876

Closed

b-naber mentioned this pull request Jul 13, 2025

Refactor resolve_ident_in_module to use scopes #142547

Closed

matthiaskrgr mentioned this pull request Jul 13, 2025

Rollup of 12 pull requests #143886

Closed

matthiaskrgr mentioned this pull request Jul 13, 2025

Rollup of 11 pull requests #143888

Open

Refactor resolve resolution bindings #143734

Are you sure you want to change the base?

Refactor resolve resolution bindings #143734

Conversation

LorrensP-2158466 commented Jul 10, 2025

Uh oh!

LorrensP-2158466 commented Jul 10, 2025

Uh oh!

b-naber commented Jul 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 10, 2025

Uh oh!

b-naber commented Jul 10, 2025

Uh oh!

LorrensP-2158466 commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

b-naber commented Jul 10, 2025

Uh oh!

LorrensP-2158466 commented Jul 10, 2025

Uh oh!

LorrensP-2158466 commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

petrochenkov commented Jul 11, 2025

Uh oh!

b-naber commented Jul 11, 2025

Uh oh!

LorrensP-2158466 commented Jul 11, 2025

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 11, 2025

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 11, 2025

Uh oh!

rustbot commented Jul 11, 2025

Uh oh!

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 11, 2025

Uh oh!

petrochenkov commented Jul 12, 2025

Uh oh!

LorrensP-2158466 commented Jul 12, 2025

Uh oh!

petrochenkov commented Jul 12, 2025

Uh oh!

bors commented Jul 12, 2025

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 10, 2025 •

edited

Loading

LorrensP-2158466 commented Jul 10, 2025 •

edited

Loading