Skip to content

Commit

Permalink
Unrolled build for rust-lang#127964
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
rust-timer authored Jul 20, 2024
2 parents 73a2281 + 36ebf7a commit f5140d7
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
//! notably is built via cargo: this means that if your test wants some non-trivial utility, such
//! as `object` or `wasmparser`, they can be re-exported and be made available through this library.
// We want to control use declaration ordering and spacing (and preserve use group comments), so
// skip rustfmt on this file.
#![cfg_attr(rustfmt, rustfmt::skip)]

mod command;
mod macros;
mod util;
Expand All @@ -18,6 +22,8 @@ pub mod scoped_run;
pub mod string;
pub mod targets;

// Internally we call our fs-related support module as `fs`, but re-export its content as `rfs`
// to tests to avoid colliding with commonly used `use std::fs;`.
mod fs;

/// [`std::fs`] wrappers and assorted filesystem-related helpers. Public to tests as `rfs` to not be
Expand Down

0 comments on commit f5140d7

Please sign in to comment.