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.

Sign up for GitHub

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

Jump to bottom

resolve: Turn the binding from #[macro_export] into a proper Import #103760

Merged
merged 2 commits into from
Nov 1, 2022
Merged

resolve: Turn the binding from #[macro_export] into a proper Import #103760

merged 2 commits into from
Nov 1, 2022

Conversation

petrochenkov
Copy link
Contributor

Continuation of #91795.

#[macro_export]
macro_rules! m { /*...*/ }

is desugared to something like

macro_rules! m { /*...*/ } // Non-modularized macro_rules item

pub use m; // It's modularized reexport

This PR adjusts the internal representation to better match this model.

@rustbot
Copy link
Collaborator

rustbot commented Oct 30, 2022

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@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 Oct 30, 2022
@cjgillot cjgillot self-assigned this Oct 30, 2022
cjgillot
cjgillot reviewed Oct 30, 2022
View reviewed changes
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved
src/test/ui/duplicate/duplicate-check-macro-exports.stderr Outdated Show resolved Hide resolved
src/test/ui/imports/local-modularized-tricky-fail-1.stderr Outdated Show resolved Hide resolved
src/test/ui/duplicate/duplicate-check-macro-exports.rs Outdated Show resolved Hide resolved
@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 Oct 31, 2022
@petrochenkov
Copy link
Contributor 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 Oct 31, 2022
@cjgillot
Copy link
Contributor

cjgillot commented Nov 1, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 1, 2022

📌 Commit 8431751 has been approved by cjgillot

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 Nov 1, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Nov 1, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 1, 2022
@bors
Auto merge of rust-lang#103841 - Dylan-DPC:rollup-rff2x1l, r=Dylan-DPC
ab5a2bc 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#84022 (Make PROC_MACRO_DERIVE_RESOLUTION_FALLBACK a hard error)
 - rust-lang#103760 (resolve: Turn the binding from `#[macro_export]` into a proper `Import`)
 - rust-lang#103813 (rustdoc: remove unnecessary CSS `.search-results { clear: both }`)
 - rust-lang#103817 (rustdoc: rename syntax highlighting CSS class `attribute` to `attr`)
 - rust-lang#103833 (:arrow_up: rust-analyzer)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 68afa32 into rust-lang:master Nov 1, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 1, 2022
@petrochenkov petrochenkov mentioned this pull request Nov 5, 2022
Merged
@apiraino apiraino mentioned this pull request Jan 4, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot left review comments

Assignees

@wesleywiser wesleywiser

@cjgillot cjgillot

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.67.0
Development

Successfully merging this pull request may close these issues.
5 participants
@petrochenkov @rustbot @cjgillot @bors @wesleywiser