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

run_make_support: skip rustfmt for lib.rs #127964

Merged
merged 1 commit into from
Jul 20, 2024

Conversation

jieyouxu
Copy link
Member

To avoid them getting reordered once #125443 goes through.

r? @nnethercote (since you were working on this)

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 19, 2024
pub use external_deps::{c_build, cc, clang, htmldocck, llvm, python, rustc, rustdoc};

// These rely on external dependencies.
#[rustfmt::skip]
pub use c_build::build_native_static_lib;
pub use cc::{cc, extra_c_flags, extra_cxx_flags, Cc};
pub use clang::{clang, Clang};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are more comments and blank lines below here. All of the comments apply to single lines, so no comments will end up on incorrect places. But ordering will be changed and blank lines removed. Given that this file mostly contains use declaration, it might just be better to add a single #![rustfmt::skip] at the top to inhibit formatting of the entire file. This was done for a few files in #126776.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, just slapped a #![cfg_attr(rustfmt, rustfmt::skip)] to the lib.rs file.

@rust-cloud-vms rust-cloud-vms bot force-pushed the rmake-rustfmt-skip branch from 47cb497 to 36ebf7a Compare July 19, 2024 13:43
@nnethercote
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 19, 2024

📌 Commit 36ebf7a has been approved by nnethercote

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 Jul 19, 2024
@nnethercote
Copy link
Contributor

@bors rollup

@jieyouxu jieyouxu changed the title run_make_support: add #[rustfmt::skip] barriers to comments for use groups run_make_support: skip rustfmt for lib.rs Jul 20, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 20, 2024
…thercote

run_make_support: skip rustfmt for lib.rs

To avoid them getting reordered once rust-lang#125443 goes through.

r? `@nnethercote` (since you were working on this)
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 20, 2024
…thercote

run_make_support: skip rustfmt for lib.rs

To avoid them getting reordered once rust-lang#125443 goes through.

r? ```@nnethercote``` (since you were working on this)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#127463 ( use precompiled rustdoc with CI rustc)
 - rust-lang#127779 (Add a hook for `should_codegen_locally`)
 - rust-lang#127843 (unix: document unsafety for std `sig{action,altstack}`)
 - rust-lang#127873 (kmc-solid: `#![forbid(unsafe_op_in_unsafe_fn)]`)
 - rust-lang#127917 (match lowering: Split `finalize_or_candidate` into more coherent methods)
 - rust-lang#127964 (run_make_support: skip rustfmt for lib.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8963855 into rust-lang:master Jul 20, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2024
Rollup merge of rust-lang#127964 - jieyouxu:rmake-rustfmt-skip, r=nnethercote

run_make_support: skip rustfmt for lib.rs

To avoid them getting reordered once rust-lang#125443 goes through.

r? ``@nnethercote`` (since you were working on this)
@rustbot rustbot added this to the 1.81.0 milestone Jul 20, 2024
@jieyouxu jieyouxu deleted the rmake-rustfmt-skip branch October 21, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants