Skip to content

Avoid resolving path keywords outside TypeNS - #160444

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
mu001999-contrib:fix-160195
Aug 5, 2026
Merged

Avoid resolving path keywords outside TypeNS#160444
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
mu001999-contrib:fix-160195

Conversation

@mu001999

@mu001999 mu001999 commented Aug 3, 2026

Copy link
Copy Markdown
Member

Fixes #160195

After allowing trailing self, self imports were resolved in all namespaces wrongly. Resolving path keywords should return Determined immediately outside TypeNS.

r? petrochenkov

@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 Aug 3, 2026
petrochenkov
petrochenkov reviewed Aug 3, 2026
View reviewed changes
Comment thread compiler/rustc_resolve/src/ident.rs Outdated
Comment thread compiler/rustc_resolve/src/ident.rs Outdated
@petrochenkov 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 Aug 3, 2026
petrochenkov
petrochenkov reviewed Aug 4, 2026
View reviewed changes
Comment thread compiler/rustc_resolve/src/ident.rs
shirok1
shirok1 reviewed Aug 4, 2026
View reviewed changes
Comment thread tests/ui/resolve/macro-determinacy-non-module-issue-160195.rs
@mu001999

mu001999 commented Aug 4, 2026

Copy link
Copy Markdown
Member Author

@rustbot ready

@rustbot 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 Aug 4, 2026
@petrochenkov

petrochenkov commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-bors Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

📌 Commit e3464ab has been approved by petrochenkov

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 10. This pull request will be tested once the tree is reopened.

Reason for tree closure: manually handling queue due to backlog

@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 Aug 4, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 5, 2026
@JonathanBrouwer
Rollup merge of rust-lang#160444 - mu001999-contrib:fix-160195, r=pet…
c1ceec0 
…rochenkov

Avoid resolving path keywords outside `TypeNS`

Fixes rust-lang#160195

After allowing trailing `self`, `self` imports were resolved in all namespaces wrongly. Resolving path keywords should return `Determined` immediately outside `TypeNS`.

r? petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Aug 5, 2026
Closed
jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 5, 2026
@jhpratt
Rollup merge of rust-lang#160444 - mu001999-contrib:fix-160195, r=pet…
de8756e 
…rochenkov

Avoid resolving path keywords outside `TypeNS`

Fixes rust-lang#160195

After allowing trailing `self`, `self` imports were resolved in all namespaces wrongly. Resolving path keywords should return `Determined` immediately outside `TypeNS`.

r? petrochenkov
@jhpratt jhpratt mentioned this pull request Aug 5, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 5, 2026
@JonathanBrouwer
Rollup merge of rust-lang#160444 - mu001999-contrib:fix-160195, r=pet…
87b0606 
…rochenkov

Avoid resolving path keywords outside `TypeNS`

Fixes rust-lang#160195

After allowing trailing `self`, `self` imports were resolved in all namespaces wrongly. Resolving path keywords should return `Determined` immediately outside `TypeNS`.

r? petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Aug 5, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Aug 5, 2026
@bors
Auto merge of #160554 - JonathanBrouwer:rollup-clq6Y1g, r=JonathanBro…
6eefd8c 
…uwer

Rollup of 22 pull requests

Successful merges:

 - #158147 (std: fix stack buffer overflow in Windows junction_point)
 - #159784 (Hint that memchr returns an in-bounds index)
 - #160130 (Select cache values to verify by key fingerprint, not value fingerprint)
 - #160343 (Rename `OutlivesPredicate` to `OutlivesClause`)
 - #160360 (Remove rustc_middle dependency on rustc_hir_pretty)
 - #160387 (rustc_codegen_ssa: Correctly apply the static `--jobs-backend` limit to backend parallelism)
 - #160422 (move mir-opt miri tests to CI logic)
 - #160444 (Avoid resolving path keywords outside `TypeNS`)
 - #160510 (Resolver: (un)tracked borrows for `CmRefCell` made safe my unsafe speculative flag)
 - #155424 ([blocked] Link to proposed LLM policy in CONTRIBUTING and pull request template)
 - #158726 (std: move futex implementations into sys::sync::futex)
 - #159225 (Split IncrCompSession out of Session)
 - #159820 (Make the `rustc_unsafe_specialization_marker` attribute actually `unsafe`)
 - #160198 (Rework `smallest_range_containing` to handle duplicates)
 - #160362 (Split `SpannedTypeVisitor` into its own crate, `rustc_ty_walk`)
 - #160390 (autodiff: Handle slice-tailed DSTs in type trees)
 - #160420 (Suggest `cast_signed()` for overflowing signed integer literals)
 - #160520 (Add some tests for specialization)
 - #160522 (fix(bootstrap): Normalize the names of proc macro dependency crates)
 - #160531 (docs: fix typo in AllowExprMetavar comment)
 - #160538 (Update expect messages in tcp.rs doc examples to follow the style guide)
 - #160548 (bootstrap: Register `coverage-map` and `coverage-run` aliases via a separate step)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 5, 2026
@JonathanBrouwer
Rollup merge of rust-lang#160444 - mu001999-contrib:fix-160195, r=pet…
680da6f 
…rochenkov

Avoid resolving path keywords outside `TypeNS`

Fixes rust-lang#160195

After allowing trailing `self`, `self` imports were resolved in all namespaces wrongly. Resolving path keywords should return `Determined` immediately outside `TypeNS`.

r? petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Aug 5, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Aug 5, 2026
@bors
Auto merge of #160557 - JonathanBrouwer:rollup-OtzfGt5, r=JonathanBro…
94031e1 
…uwer

Rollup of 25 pull requests

Successful merges:

 - #154585 (treat no_mangle_generic_items as hard error instead of lint warning)
 - #158147 (std: fix stack buffer overflow in Windows junction_point)
 - #160130 (Select cache values to verify by key fingerprint, not value fingerprint)
 - #160343 (Rename `OutlivesPredicate` to `OutlivesClause`)
 - #160360 (Remove rustc_middle dependency on rustc_hir_pretty)
 - #160387 (rustc_codegen_ssa: Correctly apply the static `--jobs-backend` limit to backend parallelism)
 - #160422 (move mir-opt miri tests to CI logic)
 - #160444 (Avoid resolving path keywords outside `TypeNS`)
 - #160510 (Resolver: (un)tracked borrows for `CmRefCell` made safe my unsafe speculative flag)
 - #155424 ([blocked] Link to proposed LLM policy in CONTRIBUTING and pull request template)
 - #158726 (std: move futex implementations into sys::sync::futex)
 - #158762 (Emit thumb code on VEX V5)
 - #159225 (Split IncrCompSession out of Session)
 - #159820 (Make the `rustc_unsafe_specialization_marker` attribute actually `unsafe`)
 - #160198 (Rework `smallest_range_containing` to handle duplicates)
 - #160362 (Split `SpannedTypeVisitor` into its own crate, `rustc_ty_walk`)
 - #160390 (autodiff: Handle slice-tailed DSTs in type trees)
 - #160420 (Suggest `cast_signed()` for overflowing signed integer literals)
 - #160516 (Add regression test for HRTB projection in closure)
 - #160520 (Add some tests for specialization)
 - #160522 (fix(bootstrap): Normalize the names of proc macro dependency crates)
 - #160523 (Add regression test for opaque type)
 - #160531 (docs: fix typo in AllowExprMetavar comment)
 - #160538 (Update expect messages in tcp.rs doc examples to follow the style guide)
 - #160548 (bootstrap: Register `coverage-map` and `coverage-run` aliases via a separate step)
@JonathanBrouwer JonathanBrouwer mentioned this pull request Aug 5, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Aug 5, 2026
@bors
Auto merge of #160559 - JonathanBrouwer:rollup-grEEuN1, r=JonathanBro…
87212ce 
…uwer

Rollup of 25 pull requests

Successful merges:

 - #158147 (std: fix stack buffer overflow in Windows junction_point)
 - #160130 (Select cache values to verify by key fingerprint, not value fingerprint)
 - #160343 (Rename `OutlivesPredicate` to `OutlivesClause`)
 - #160360 (Remove rustc_middle dependency on rustc_hir_pretty)
 - #160387 (rustc_codegen_ssa: Correctly apply the static `--jobs-backend` limit to backend parallelism)
 - #160422 (move mir-opt miri tests to CI logic)
 - #160444 (Avoid resolving path keywords outside `TypeNS`)
 - #160510 (Resolver: (un)tracked borrows for `CmRefCell` made safe by unsafe speculative flag)
 - #155424 ([blocked] Link to proposed LLM policy in CONTRIBUTING and pull request template)
 - #158726 (std: move futex implementations into sys::sync::futex)
 - #158762 (Emit thumb code on VEX V5)
 - #159225 (Split IncrCompSession out of Session)
 - #159820 (Make the `rustc_unsafe_specialization_marker` attribute actually `unsafe`)
 - #160198 (Rework `smallest_range_containing` to handle duplicates)
 - #160362 (Split `SpannedTypeVisitor` into its own crate, `rustc_ty_walk`)
 - #160390 (autodiff: Handle slice-tailed DSTs in type trees)
 - #160420 (Suggest `cast_signed()` for overflowing signed integer literals)
 - #160501 (Add bootstrap CLI snapshot test for testing miri)
 - #160516 (Add regression test for HRTB projection in closure)
 - #160520 (Add some tests for specialization)
 - #160522 (fix(bootstrap): Normalize the names of proc macro dependency crates)
 - #160523 (Add regression test for opaque type)
 - #160531 (docs: fix typo in AllowExprMetavar comment)
 - #160538 (Update expect messages in tcp.rs doc examples to follow the style guide)
 - #160548 (bootstrap: Register `coverage-map` and `coverage-run` aliases via a separate step)
@rust-bors
rust-bors Bot merged commit 1966d4f into rust-lang:main Aug 5, 2026
13 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Aug 5, 2026
rust-timer added a commit that referenced this pull request Aug 5, 2026
@rust-timer
Unrolled build for #160444
b45ce0c 
Rollup merge of #160444 - mu001999-contrib:fix-160195, r=petrochenkov

Avoid resolving path keywords outside `TypeNS`

Fixes #160195

After allowing trailing `self`, `self` imports were resolved in all namespaces wrongly. Resolving path keywords should return `Determined` immediately outside `TypeNS`.

r? petrochenkov
@JonathanBrouwer

JonathanBrouwer commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@rust-timer build b45ce0c

@rust-timer

rust-timer commented Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Queued b45ce0c with parent 22950ab, future comparison URL.
There are currently 6 preceding artifacts in the queue.
It will probably take at least ~6.8 hours until the benchmark run finishes.

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

Reviewers

@petrochenkov petrochenkov petrochenkov left review comments
+1 more reviewer
@shirok1 shirok1 shirok1 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@petrochenkov petrochenkov

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

Milestone

1.99.0

Development

Successfully merging this pull request may close these issues.

error: cannot determine resolution for the macro itself is not stably triggering on 1.97.1

6 participants

@mu001999 @petrochenkov @JonathanBrouwer @rust-timer @shirok1 @rustbot