Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc_resolve: Test the order that preludes are resolved #138840

Merged
merged 1 commit into from
Apr 1, 2025

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 22, 2025

This test is exhaustive. See attached truth table:
image

Companion PR to rust-lang/reference#1765.

@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2025

r? @wesleywiser

rustbot has assigned @wesleywiser.
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

@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 Mar 22, 2025
@jyn514
Copy link
Member Author

jyn514 commented Mar 22, 2025

I had trouble with the libs row because, to my knowledge, the std prelude does not define any attribute macros, and rustc_resolve ignores macros from other namespaces: https://doc.rust-lang.org/nightly/reference/names/namespaces.html#sub-namespaces

but i couldn't think of a better test. maybe @petrochenkov has ideas.

@jyn514
Copy link
Member Author

jyn514 commented Mar 22, 2025

... i am a fool.
image

(will fix the tests shortly.)

@jyn514 jyn514 force-pushed the precedence-order branch from 0522b05 to 4942d3d Compare March 22, 2025 20:47
@workingjubilee
Copy link
Member

| ...... |  tool  | extern | macro  | lang   | libs   |
|   tool |    N/A |                   mirror
| extern |  macro |    N/A |             universe
|  macro |   lang |  macro |    N/A |
|   lang |    N/A |   lang |      † |   N/A  |
|   libs |   tool | extern |  macro |   lang |     N/A |

† ambiguous

@rust-log-analyzer

This comment has been minimized.

@jyn514 jyn514 force-pushed the precedence-order branch from 14238b6 to bdb144e Compare March 29, 2025 03:57
@jyn514
Copy link
Member Author

jyn514 commented Mar 29, 2025

ok i have fixed the tests and updated the truth table. the main problem was that i had confused the type namespace and macro namespace, several times, and also had put things in multiple namespaces in a way that confused myself about what was actually being tested.

@jyn514 jyn514 force-pushed the precedence-order branch from bdb144e to 49c3256 Compare March 29, 2025 04:03
@rust-log-analyzer

This comment has been minimized.

@jyn514 jyn514 force-pushed the precedence-order branch from 49c3256 to 41fdd28 Compare March 29, 2025 23:18
@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 31, 2025

📌 Commit 41fdd28 has been approved by wesleywiser

It is now in the queue for this repository.

@bors 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 Mar 31, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#138426 (Fix `armv7-sony-vita-newlibeabihf` LLVM target triple)
 - rust-lang#138840 (rustc_resolve: Test the order that preludes are resolved)
 - rust-lang#139039 (Reduce kw::Empty usage, part 4)
 - rust-lang#139151 (tidy: properly check for orphaned unstable_book pages)
 - rust-lang#139176 (Remove fragile equal-pointers-unequal/*/print3.rs tests.)
 - rust-lang#139179 (Remove me from vacation)
 - rust-lang#139181 (Fix invalid link in docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5048534 into rust-lang:master Apr 1, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 1, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2025
Rollup merge of rust-lang#138840 - jyn514:precedence-order, r=wesleywiser

rustc_resolve: Test the order that preludes are resolved

This test is exhaustive. See attached truth table:
![image](https://github.com/user-attachments/assets/11fe703c-e114-48df-84f8-426b63395784)

Companion PR to rust-lang/reference#1765.
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.

6 participants