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

Enforce formatting for rustc_codegen_cranelift #92438

Merged
merged 1 commit into from
Jan 2, 2022
Merged

Enforce formatting for rustc_codegen_cranelift #92438

merged 1 commit into from
Jan 2, 2022

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Dec 30, 2021 •
edited by Mark-Simulacrum
Loading

No description provided.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 30, 2021
@rust-highfive
Copy link
Collaborator

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(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 Dec 30, 2021
@petrochenkov petrochenkov added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 30, 2021
@camelid
Copy link
Member

camelid commented Jan 1, 2022

No longer blocked, just needs rebase now. @rustbot author

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 1, 2022
@camelid camelid removed the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label Jan 1, 2022
@bjorn3
Copy link
Member Author

bjorn3 commented Jan 1, 2022

Rebased

@bjorn3 bjorn3 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 Jan 1, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+

Seems OK to me, though note that the rustfmt used in rust-lang/rust CI is from a pinned nightly, bumped alongside the bootstrap compiler.

@bors
Copy link
Contributor

bors commented Jan 1, 2022

📌 Commit bffe880 has been approved by Mark-Simulacrum

@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 Jan 1, 2022
@joshtriplett
Copy link
Member

Is there an issue filed for the breakage rustfmt causes with y.rs?

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 1, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 2, 2022
@bors
Auto merge of rust-lang#92482 - matthiaskrgr:rollup-uso1zi0, r=matthi…
7b13c62 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#84083 (Clarify the guarantees that ThreadId does and doesn't make.)
 - rust-lang#91593 (Remove unnecessary bounds for some Hash{Map,Set} methods)
 - rust-lang#92297 (Reduce compile time of rustbuild)
 - rust-lang#92332 (Add test for where clause order)
 - rust-lang#92438 (Enforce formatting for rustc_codegen_cranelift)
 - rust-lang#92463 (Remove pronunciation guide from Vec<T>)
 - rust-lang#92468 (Emit an error for `--cfg=)`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f6ce1e8 into rust-lang:master Jan 2, 2022
@rustbot rustbot added this to the 1.59.0 milestone Jan 2, 2022
@bjorn3 bjorn3 deleted the less_cg_clif_exceptions branch January 2, 2022 09:26
@bjorn3
Copy link
Member Author

bjorn3 commented Jan 2, 2022

The breakage to y.rs isn't rustfmt's fault. It starts with:

#!/usr/bin/env bash
#![allow()] /*This line is ignored by bash
# This block is ignored by rustc

Rustfmt puts the comment on a newline, but this causes it to be interpreted as command by bash rather than as comment.

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

@Mark-Simulacrum Mark-Simulacrum

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

Successfully merging this pull request may close these issues.
8 participants
@bjorn3 @rust-highfive @camelid @Mark-Simulacrum @bors @joshtriplett @petrochenkov @rustbot