Skip to content

Comments

Fix global_asm macro pretty printing#101369

Merged
bors merged 1 commit intorust-lang:masterfrom
compiler-errors:global-asm-pprint
Sep 4, 2022
Merged

Fix global_asm macro pretty printing#101369
bors merged 1 commit intorust-lang:masterfrom
compiler-errors:global-asm-pprint

Conversation

@compiler-errors
Copy link
Contributor

@compiler-errors compiler-errors commented Sep 3, 2022

Fixes #101051
Fixes #101047

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 3, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 3, 2022

r? @jackh726

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 3, 2022
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Sep 3, 2022 •
edited
Loading

cc @ojeda, this fixes the global_asm! mysteriously disappearing and the missing semicolon, but not the path being shortened (core::arch::global_asm -> global_asm) and the indentation within the macro's string contents itself -- if those latter two are issues, do you mind filing separate bugs for them? I couldn't tell if both of those were blockers too, or just asides that you thought you'd mention in the issues I linked.

@ojeda
Copy link
Contributor

ojeda commented Sep 3, 2022

@compiler-errors Thanks a lot! They are not blockers in the sense that one can still run rustfmt on top of it (and anyway the output of this feature is best-effort anyway as far as I understand).

Having said that, I think the closer the output looks to the source code, the better; and in particular the case of the shortened path may be fairly surprising and easily makes the code non-compilable (even if that is a non-goal of -Zunpretty=expanded). So I think it is worth opening an issue for it, even if only for future reference -- I will do so.

@ojeda ojeda mentioned this pull request Sep 3, 2022
Open
66 tasks
@jackh726
Copy link
Member

jackh726 commented Sep 3, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 3, 2022

📌 Commit e9b01c7 has been approved by jackh726

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 Sep 3, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 3, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 4, 2022
@bors
Auto merge of rust-lang#101396 - matthiaskrgr:rollup-9n0257m, r=matth…
5fecdb7 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#100302 (Suggest associated method on deref types when path syntax method fails)
 - rust-lang#100647 ( Make trait bound not satisfied specify kind)
 - rust-lang#101349 (rustdoc: remove `.impl-items { flex-basis }` CSS, not in flex container)
 - rust-lang#101369 (Fix `global_asm` macro pretty printing)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a3dda51 into rust-lang:master Sep 4, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 4, 2022
@compiler-errors compiler-errors deleted the global-asm-pprint branch November 2, 2022 02:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jackh726 jackh726

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.65.0

6 participants

@compiler-errors @rust-highfive @ojeda @jackh726 @bors @rustbot