upgrade to nightly-2025-04-14

diliop · facebook-github-bot · commit 59b206d1dd21 · 2025-04-15T10:11:05.000-07:00
Summary:
As per the title - to review, the `rustfmt`-specific changes are isolated under `fbsource/tools/third-party/rustfmt` and the rest are codemodded

allow-large-files
ignore-conflict-markers

Reviewed By: capickett

Differential Revision: D73041643

fbshipit-source-id: 14092a58e4439d689ff7eea9cfbd9477071809e4
diff --git a/examples/cargo.rs b/examples/cargo.rs
@@ -10,12 +10,12 @@
 use std::thread::sleep;
 use std::time::Duration;
 
-use superconsole::style::Stylize;
 use superconsole::Component;
 use superconsole::Line;
 use superconsole::Lines;
 use superconsole::Span;
 use superconsole::SuperConsole;
+use superconsole::style::Stylize;
 
 const CRATES: &str = include_str!("cargo/crates.txt");
 const WIDTH: usize = "=======>                  ".len() - 1;
diff --git a/examples/finalization.rs b/examples/finalization.rs
@@ -12,11 +12,11 @@
 use std::time::Duration;
 
 use derive_more::Display;
-use superconsole::components::Component;
-use superconsole::components::DrawMode;
 use superconsole::Dimensions;
 use superconsole::Lines;
 use superconsole::SuperConsole;
+use superconsole::components::Component;
+use superconsole::components::DrawMode;
 use tokio::time;
 
 /// A component representing a store greeter.
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
@@ -12,12 +12,12 @@
 use std::time::Duration;
 use std::time::Instant;
 
-use superconsole::components::Component;
-use superconsole::components::DrawMode;
 use superconsole::Dimensions;
 use superconsole::Line;
 use superconsole::Lines;
 use superconsole::SuperConsole;
+use superconsole::components::Component;
+use superconsole::components::DrawMode;
 use tokio::select;
 use tokio::time;
 
diff --git a/examples/readme.rs b/examples/readme.rs
@@ -9,13 +9,13 @@
 
 // If this code needs fixing, make sure you fix the README.md too!
 
-use superconsole::components::bordering::Bordered;
-use superconsole::components::bordering::BorderedSpec;
 use superconsole::Component;
 use superconsole::Dimensions;
 use superconsole::DrawMode;
 use superconsole::Lines;
 use superconsole::SuperConsole;
+use superconsole::components::bordering::Bordered;
+use superconsole::components::bordering::BorderedSpec;
 
 #[derive(Debug)]
 struct HelloWorld;
diff --git a/examples/stylized.rs b/examples/stylized.rs
@@ -12,17 +12,17 @@
 use std::time::Duration;
 
 use derive_more::Display;
-use superconsole::components::Blank;
-use superconsole::components::Component;
-use superconsole::components::DrawMode;
-use superconsole::style::style;
-use superconsole::style::Color;
-use superconsole::style::Stylize;
 use superconsole::Dimensions;
 use superconsole::Line;
 use superconsole::Lines;
 use superconsole::Span;
 use superconsole::SuperConsole;
+use superconsole::components::Blank;
+use superconsole::components::Component;
+use superconsole::components::DrawMode;
+use superconsole::style::Color;
+use superconsole::style::Stylize;
+use superconsole::style::style;
 use tokio::time;
 
 /// A component representing a store greeter.
diff --git a/src/builder.rs b/src/builder.rs
@@ -10,11 +10,11 @@
 use std::io;
 use std::io::Write;
 
+use crate::Dimensions;
+use crate::SuperConsole;
 use crate::output::BlockingSuperConsoleOutput;
 use crate::output::NonBlockingSuperConsoleOutput;
 use crate::output::SuperConsoleOutput;
-use crate::Dimensions;
-use crate::SuperConsole;
 
 /// A builder to create SuperConsole, with more options.
 pub struct Builder {
diff --git a/src/components.rs b/src/components.rs
@@ -19,10 +19,10 @@ pub use bounding::Bounded;
 pub use padding::Padded;
 pub use splitting::Split;
 
-pub use crate::components::draw_horizontal::DrawHorizontal;
-pub use crate::components::draw_vertical::DrawVertical;
 use crate::Dimensions;
 use crate::Lines;
+pub use crate::components::draw_horizontal::DrawHorizontal;
+pub use crate::components::draw_vertical::DrawVertical;
 
 pub mod alignment;
 mod blank;
diff --git a/src/components/alignment.rs b/src/components/alignment.rs
@@ -12,11 +12,11 @@
 //! One may align text left, center, or right, and top, middle, or bottom.
 //! Additionally, horizontally left aligned text may be optionally justified.
 
-use crate::components::Blank;
 use crate::Component;
 use crate::Dimensions;
 use crate::DrawMode;
 use crate::Lines;
+use crate::components::Blank;
 
 /// Select the alignment of the vertical content
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
@@ -125,15 +125,15 @@ impl<C: Component> Component for Aligned<C> {
 mod tests {
     use derive_more::AsRef;
 
-    use crate::components::alignment::HorizontalAlignmentKind;
-    use crate::components::alignment::VerticalAlignmentKind;
-    use crate::components::echo::Echo;
-    use crate::components::Aligned;
-    use crate::components::DrawMode;
     use crate::Component;
     use crate::Dimensions;
     use crate::Line;
     use crate::Lines;
+    use crate::components::Aligned;
+    use crate::components::DrawMode;
+    use crate::components::alignment::HorizontalAlignmentKind;
+    use crate::components::alignment::VerticalAlignmentKind;
+    use crate::components::echo::Echo;
 
     #[derive(AsRef, Debug)]
     #[allow(dead_code)]
diff --git a/src/components/blank.rs b/src/components/blank.rs
@@ -7,10 +7,10 @@
  * of this source tree.
  */
 
-use crate::components::Dimensions;
-use crate::components::DrawMode;
 use crate::Component;
 use crate::Lines;
+use crate::components::Dimensions;
+use crate::components::DrawMode;
 
 /// The `Blank` component is a dead-end component that emits nothing.
 /// It can be used for testing purposes or to make a portion of a dividing component empty.
@@ -29,11 +29,11 @@ impl Component for Blank {
 mod tests {
     use derive_more::AsRef;
 
-    use crate::components::echo::Echo;
-    use crate::components::DrawMode;
     use crate::Component;
     use crate::Dimensions;
     use crate::Lines;
+    use crate::components::DrawMode;
+    use crate::components::echo::Echo;
 
     #[derive(AsRef, Debug)]
     #[allow(dead_code)]
diff --git a/src/components/bordering.rs b/src/components/bordering.rs
@@ -9,15 +9,15 @@
 
 use std::borrow::Cow;
 
-use crate::components::alignment::HorizontalAlignmentKind;
-use crate::components::alignment::VerticalAlignmentKind;
-use crate::components::Aligned;
 use crate::Component;
 use crate::Dimensions;
 use crate::DrawMode;
 use crate::Line;
 use crate::Lines;
 use crate::Span;
+use crate::components::Aligned;
+use crate::components::alignment::HorizontalAlignmentKind;
+use crate::components::alignment::VerticalAlignmentKind;
 
 /// The `Bordered` component can be used to put borders on all sides of the output of its child.
 /// This is useful for delimiting the boundaries of a component for reading and aesthetic purposes.
diff --git a/src/components/bounding.rs b/src/components/bounding.rs
@@ -43,9 +43,9 @@ mod tests {
     use derive_more::AsRef;
 
     use super::*;
-    use crate::components::echo::Echo;
     use crate::Line;
     use crate::Span;
+    use crate::components::echo::Echo;
 
     #[derive(AsRef, Debug)]
     #[allow(dead_code)]
diff --git a/src/components/draw_horizontal.rs b/src/components/draw_horizontal.rs
@@ -60,12 +60,12 @@ impl DrawHorizontal {
 #[cfg(test)]
 mod tests {
 
-    use crate::components::draw_horizontal::DrawHorizontal;
     use crate::Component;
     use crate::Dimensions;
     use crate::DrawMode;
     use crate::Line;
     use crate::Lines;
+    use crate::components::draw_horizontal::DrawHorizontal;
 
     #[test]
     fn test_draw_horizontal() {
diff --git a/src/components/draw_vertical.rs b/src/components/draw_vertical.rs
@@ -54,12 +54,12 @@ impl DrawVertical {
 
 #[cfg(test)]
 mod tests {
-    use crate::components::DrawVertical;
     use crate::Component;
     use crate::Dimensions;
     use crate::DrawMode;
     use crate::Line;
     use crate::Lines;
+    use crate::components::DrawVertical;
 
     #[test]
     fn test_draw_vertical() {
diff --git a/src/components/echo.rs b/src/components/echo.rs
@@ -9,10 +9,10 @@
 
 #![cfg(test)]
 
-use crate::components::Dimensions;
-use crate::components::DrawMode;
 use crate::Component;
 use crate::Lines;
+use crate::components::Dimensions;
+use crate::components::DrawMode;
 
 /// Component that repeats whatever lines are put into it.
 /// Used in tests.
diff --git a/src/components/padding.rs b/src/components/padding.rs
@@ -7,11 +7,11 @@
  * of this source tree.
  */
 
+use crate::Component;
+use crate::Lines;
 use crate::components::Blank;
 use crate::components::Dimensions;
 use crate::components::DrawMode;
-use crate::Component;
-use crate::Lines;
 
 /// The `Padded` [`Component`] wraps its child by padding left, right, above, and below its content.
 /// This can be used to shift the content to a different location and ensure that following content comes after a certain distance.
@@ -76,13 +76,13 @@ impl<C: Component> Component for Padded<C> {
 mod tests {
     use derive_more::AsRef;
 
-    use crate::components::echo::Echo;
-    use crate::components::Padded;
     use crate::Component;
     use crate::Dimensions;
     use crate::DrawMode;
     use crate::Line;
     use crate::Lines;
+    use crate::components::Padded;
+    use crate::components::echo::Echo;
 
     #[derive(Debug, AsRef)]
     #[allow(dead_code)]
diff --git a/src/components/splitting.rs b/src/components/splitting.rs
@@ -187,8 +187,8 @@ mod tests {
 
     mod horizontal {
         use super::*;
-        use crate::components::echo::Echo;
         use crate::Dimensions;
+        use crate::components::echo::Echo;
         #[test]
         fn test_adaptive() {
             let kind = SplitKind::Adaptive;
@@ -328,8 +328,8 @@ mod tests {
 
     mod vertical {
         use super::*;
-        use crate::components::echo::Echo;
         use crate::Dimensions;
+        use crate::components::echo::Echo;
 
         #[test]
         fn test_equal() {
@@ -443,8 +443,8 @@ mod tests {
 
     mod panics {
         use super::*;
-        use crate::components::Blank;
         use crate::Dimensions;
+        use crate::components::Blank;
 
         #[test]
         fn test_no_children() {
diff --git a/src/content/line.rs b/src/content/line.rs
@@ -16,15 +16,15 @@ use std::mem;
 use std::slice;
 use std::vec;
 
+use crossterm::Command;
 use crossterm::cursor::MoveToColumn;
 use crossterm::terminal::Clear;
 use crossterm::terminal::ClearType;
-use crossterm::Command;
 use unicode_segmentation::UnicodeSegmentation;
 
-use crate::vec_as_fmt_write::VecAsFmtWrite;
 use crate::Span;
 use crate::SpanError;
+use crate::vec_as_fmt_write::VecAsFmtWrite;
 
 /// A `Line` is an abstraction for a collection of stylized or unstylized strings.
 /// Since each `Span` denotes a portion of a single line, an ordered collection represents a single line of text.
diff --git a/src/content/lines.rs b/src/content/lines.rs
@@ -23,16 +23,16 @@ use termwiz::cell::Hyperlink;
 use termwiz::cell::Intensity;
 use termwiz::color::ColorSpec;
 use termwiz::color::RgbColor;
-use termwiz::escape::csi::Sgr;
-use termwiz::escape::csi::CSI;
 use termwiz::escape::Action;
 use termwiz::escape::OperatingSystemCommand;
+use termwiz::escape::csi::CSI;
+use termwiz::escape::csi::Sgr;
 
-use crate::style::ContentStyle;
-use crate::style::StyledContent;
 use crate::Dimensions;
 use crate::Line;
 use crate::Span;
+use crate::style::ContentStyle;
+use crate::style::StyledContent;
 
 #[derive(Default, Clone, Debug, Eq, PartialEq)]
 pub struct Lines(pub Vec<Line>);
diff --git a/src/content/span.rs b/src/content/span.rs
@@ -12,6 +12,7 @@ use std::fmt;
 use std::fmt::Display;
 use std::fmt::Formatter;
 
+use crossterm::Command;
 use crossterm::style::Attribute;
 use crossterm::style::Color;
 use crossterm::style::ContentStyle;
@@ -20,7 +21,6 @@ use crossterm::style::SetAttributes;
 use crossterm::style::SetBackgroundColor;
 use crossterm::style::SetForegroundColor;
 use crossterm::style::StyledContent;
-use crossterm::Command;
 use termwiz::cell;
 use termwiz::cell::Hyperlink;
 use unicode_segmentation::Graphemes;
diff --git a/src/output.rs b/src/output.rs
@@ -13,10 +13,10 @@ use std::io::Write;
 use std::thread::JoinHandle;
 
 use anyhow::Context as _;
-use crossbeam_channel::bounded;
-use crossbeam_channel::unbounded;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
+use crossbeam_channel::bounded;
+use crossbeam_channel::unbounded;
 
 use crate::Dimensions;
 
diff --git a/src/style.rs b/src/style.rs
@@ -12,9 +12,9 @@
 //! - Set the foreground or background color of the string using the `Color` enum.
 //! - Set the attribute (bold, italic, underlined, etc) using the `Attribute` enum.
 
-pub use crossterm::style::style;
 pub use crossterm::style::Attribute;
 pub use crossterm::style::Color;
 pub use crossterm::style::ContentStyle;
 pub use crossterm::style::StyledContent;
 pub use crossterm::style::Stylize;
+pub use crossterm::style::style;
diff --git a/src/superconsole.rs b/src/superconsole.rs
diff --git a/src/testing.rs b/src/testing.rs
