Skip to content

rustc_builtin_macros: make asm mod public for rustfmt - #92147

Merged
bors merged 1 commit into
rust-lang:masterfrom
calebcartwright:publicize-builtin_macro-asm
Dec 28, 2021
Merged

rustc_builtin_macros: make asm mod public for rustfmt#92147
bors merged 1 commit into
rust-lang:masterfrom
calebcartwright:publicize-builtin_macro-asm

Conversation

@calebcartwright

@calebcartwrightcalebcartwright commented Dec 21, 2021

Copy link
Copy Markdown
Member

Follow up to #92016, as I'd completely missed that the mod we needed was internal

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 21, 2021
@rust-highfive

rust-highfive commented Dec 21, 2021

Copy link
Copy Markdown
Contributor

r? @cjgillot

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 21, 2021
@jyn514

jyn514 commented Dec 21, 2021

Copy link
Copy Markdown
Member

Hmm, I think it would be better to re-export the function in the root rather than making the whole module public.

@calebcartwright

calebcartwright commented Dec 21, 2021

Copy link
Copy Markdown
MemberAuthor

Hmm, I think it would be better to re-export the function in the root rather than making the whole module public.

Well, we need the struct too. There's only 4 currently public items in that mod, so I suppose I can either re-export the 2 we need and keep the mod private, or modify the visibility on the other 2 to keep them in-crate, if there's concerns about expand_asm or expand_global_asm being used elsewhere in an undesirable manner (or similarly for any hypothetical future pub items added to asm)

@calebcartwright
calebcartwrightforce-pushed the publicize-builtin_macro-asm branch from 2133d12 to 63c2edeCompareDecember 21, 2021 17:52
@calebcartwright

calebcartwright commented Dec 21, 2021

Copy link
Copy Markdown
MemberAuthor

I've opted for the latter, but don't mind changing it if you (or anyone) feels strongly that it'd be better to do the former. Let me know

@cjgillot

cjgillot commented Dec 26, 2021

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Dec 26, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 63c2ede has been approved by cjgillot

@borsbors 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 Dec 26, 2021
@bors

bors commented Dec 27, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 63c2ede with merge 6d68b965a62b8b3c30a546673b867578a040c0f5...

@bors

bors commented Dec 27, 2021

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 27, 2021
@calebcartwright

calebcartwright commented Dec 27, 2021

Copy link
Copy Markdown
MemberAuthor

Not really sure what to make of the CI failure, seems potentially spurious so going to retry

image

@bors retry

@borsbors 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 Dec 27, 2021
@rust-log-analyzer

rust-log-analyzer commented Dec 27, 2021

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

@matthiaskrgrmatthiaskrgr mentioned this pull request Dec 27, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 27, 2021
@bors
Auto merge ofrust-lang#92329- matthiaskrgr:rollup-l3b4fl1, r=matthi…
4ee34f3
…askrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#90586 (Relax priv-in-pub lint on generic bounds and where clauses of trait impls.)
- rust-lang#92112 (Fix the error of checking `base_expr` twice in type_changing_struct_update)
- rust-lang#92147 (rustc_builtin_macros: make asm mod public for rustfmt)
- rust-lang#92161 (resolve: Minor miscellaneous cleanups from rust-lang#89059)
- rust-lang#92264 (Remove `maybe_uninit_extra` feature from Vec docs)
- rust-lang#92303 (Add test cases for issue rust-lang#26186)
- rust-lang#92307 (Fix minor typos)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit a7c79c0 into rust-lang:masterDec 28, 2021
@rustbotrustbot added this to the 1.59.0 milestone Dec 28, 2021
@calebcartwright
calebcartwright deleted the publicize-builtin_macro-asm branch December 28, 2021 01:04
@fmeasefmease added the T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. label Oct 8, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cjgillotcjgillot

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustfmtRelevant to the rustfmt team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.59.0

Development

Successfully merging this pull request may close these issues.

8 participants

@calebcartwright@rust-highfive@jyn514@cjgillot@bors@rust-log-analyzer@fmease@rustbot