about summary refs log tree commit diff
path: root/library/std/src/rt.rs
diff options
context:
space:
mode:
authorNicholas Nethercote <n.nethercote@gmail.com>2024-07-19 11:02:59 +1000
committerNicholas Nethercote <n.nethercote@gmail.com>2024-07-19 13:26:48 +1000
commitc5dadd0408bc5654f001efe0f2224ff67e5e90a7 (patch)
tree90d34a6285c04d679c9d6141374b0c1142636bb3 /library/std/src/rt.rs
parent5affbb17153bc69a9d5d8d2faa4e399a014a211e (diff)
downloadrust-c5dadd0408bc5654f001efe0f2224ff67e5e90a7.tar.gz
rust-c5dadd0408bc5654f001efe0f2224ff67e5e90a7.zip
Use `#[rustfmt::skip]` on some `use` groups to prevent reordering.
`use` declarations will be reformatted in #125443. Very rarely, there is
a desire to force a group of `use` declarations together in a way that
auto-formatting will break up. E.g. when you want a single comment to
apply to a group. #126776 dealt with all of these in the codebase,
ensuring that no comments intended for multiple `use` declarations would
end up in the wrong place. But some people were unhappy with it.

This commit uses `#[rustfmt::skip]` to create these custom `use` groups
in an idiomatic way for a few of the cases changed in #126776. This
works because rustfmt treats any `use` item annotated with
`#[rustfmt::skip]` as a barrier and won't reorder other `use` items
around it.
Diffstat (limited to 'library/std/src/rt.rs')
-rw-r--r--library/std/src/rt.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs
index deb4a8fa7ee..307a543c9d2 100644
--- a/library/std/src/rt.rs
+++ b/library/std/src/rt.rs
@@ -16,9 +16,11 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 #![allow(unused_macros)]
 
+#[rustfmt::skip]
 pub use crate::panicking::{begin_panic, panic_count};
 pub use core::panicking::{panic_display, panic_fmt};
 
+#[rustfmt::skip]
 use crate::sync::Once;
 use crate::sys;
 use crate::thread::{self, Thread};