Skip to content

Commit f5140d7

Browse files
authored
Unrolled build for rust-lang#127964
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)
2 parents 73a2281 + 36ebf7a commit f5140d7

File tree

1 file changed

+6
-0
lines changed
  • src/tools/run-make-support/src

1 file changed

+6
-0
lines changed

src/tools/run-make-support/src/lib.rs

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
//! notably is built via cargo: this means that if your test wants some non-trivial utility, such
44
//! as `object` or `wasmparser`, they can be re-exported and be made available through this library.
55
6+
// We want to control use declaration ordering and spacing (and preserve use group comments), so
7+
// skip rustfmt on this file.
8+
#![cfg_attr(rustfmt, rustfmt::skip)]
9+
610
mod command;
711
mod macros;
812
mod util;
@@ -18,6 +22,8 @@ pub mod scoped_run;
1822
pub mod string;
1923
pub mod targets;
2024

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

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

0 commit comments

Comments
 (0)