Perform a nightly group_imports rustfmt pass

oli-obk · oli-obk · commit b75d2b8cd7a2 · 2024-10-07T12:44:35.000+02:00
diff --git a/src/aux_builds.rs b/src/aux_builds.rs
@@ -1,10 +1,6 @@
 //! Everything needed to build auxilary files with rustc
 // lol we can't name this file `aux.rs` on windows
 
-use bstr::ByteSlice;
-use spanned::Spanned;
-use std::{ffi::OsString, path::PathBuf, process::Command, sync::Arc};
-
 use crate::{
     build_manager::{Build, BuildManager},
     custom_flags::Flag,
@@ -13,6 +9,9 @@ use crate::{
     status_emitter::SilentStatus,
     CrateType, Error, Errored,
 };
+use bstr::ByteSlice;
+use spanned::Spanned;
+use std::{ffi::OsString, path::PathBuf, process::Command, sync::Arc};
 
 impl Flag for AuxBuilder {
     fn must_be_unique(&self) -> bool {
diff --git a/src/build_manager.rs b/src/build_manager.rs
@@ -1,19 +1,17 @@
 //! Auxiliary and dependency builder. Extendable to custom builds.
 
-use std::{
-    collections::{hash_map::Entry, HashMap},
-    ffi::OsString,
-    sync::{Arc, OnceLock, RwLock},
-};
-
-use color_eyre::eyre::Result;
-use crossbeam_channel::{bounded, Sender};
-
 use crate::{
     status_emitter::{RevisionStyle, TestStatus},
     test_result::TestRun,
     Config, Errored,
 };
+use color_eyre::eyre::Result;
+use crossbeam_channel::{bounded, Sender};
+use std::{
+    collections::{hash_map::Entry, HashMap},
+    ffi::OsString,
+    sync::{Arc, OnceLock, RwLock},
+};
 
 /// A build shared between all tests of the same `BuildManager`
 pub trait Build {
diff --git a/src/cmd.rs b/src/cmd.rs
@@ -1,11 +1,10 @@
+use crate::display;
 use std::{
     ffi::OsString,
     path::{Path, PathBuf},
     process::Command,
 };
 
-use crate::display;
-
 #[derive(Debug, Clone)]
 /// A command, its args and its environment. Used for
 /// the main command, the dependency builder and the cfg-reader.
diff --git a/src/config.rs b/src/config.rs
@@ -1,6 +1,3 @@
-use regex::bytes::Regex;
-use spanned::Spanned;
-
 #[cfg(feature = "rustc")]
 use crate::{
     aux_builds::AuxBuilder, custom_flags::run::Run, custom_flags::rustfix::RustfixMode,
@@ -14,6 +11,8 @@ use crate::{
 };
 pub use color_eyre;
 use color_eyre::eyre::Result;
+use regex::bytes::Regex;
+use spanned::Spanned;
 use std::{
     collections::BTreeMap,
     num::NonZeroUsize,
diff --git a/src/config/args.rs b/src/config/args.rs
@@ -1,9 +1,8 @@
 //! Default argument processing when `ui_test` is used
 //! as a test driver.
 
-use std::{borrow::Cow, num::NonZeroUsize};
-
 use color_eyre::eyre::{bail, ensure, Result};
+use std::{borrow::Cow, num::NonZeroUsize};
 
 /// Plain arguments if `ui_test` is used as a binary.
 #[derive(Debug, Default)]
diff --git a/src/custom_flags.rs b/src/custom_flags.rs
@@ -1,14 +1,13 @@
 //! Define custom test flags not natively supported by ui_test
 
+use crate::{
+    build_manager::BuildManager, parser::Comments, per_test_config::TestConfig, Config, Errored,
+};
 use std::{
     panic::{RefUnwindSafe, UnwindSafe},
     process::{Command, Output},
 };
 
-use crate::{
-    build_manager::BuildManager, parser::Comments, per_test_config::TestConfig, Config, Errored,
-};
-
 #[cfg(feature = "rustc")]
 pub mod edition;
 #[cfg(feature = "rustc")]
diff --git a/src/custom_flags/edition.rs b/src/custom_flags/edition.rs
@@ -1,28 +1,27 @@
-//! Custom flag for setting the edition for all tests
-
-use crate::{build_manager::BuildManager, per_test_config::TestConfig, Errored};
-
-use super::Flag;
-
-#[derive(Debug)]
-/// Set the edition of the tests
-pub struct Edition(pub String);
-
-impl Flag for Edition {
-    fn must_be_unique(&self) -> bool {
-        true
-    }
-    fn clone_inner(&self) -> Box<dyn Flag> {
-        Box::new(Edition(self.0.clone()))
-    }
-
-    fn apply(
-        &self,
-        cmd: &mut std::process::Command,
-        _config: &TestConfig,
-        _build_manager: &BuildManager,
-    ) -> Result<(), Errored> {
-        cmd.arg("--edition").arg(&self.0);
-        Ok(())
-    }
-}
+//! Custom flag for setting the edition for all tests
+
+use super::Flag;
+use crate::{build_manager::BuildManager, per_test_config::TestConfig, Errored};
+
+#[derive(Debug)]
+/// Set the edition of the tests
+pub struct Edition(pub String);
+
+impl Flag for Edition {
+    fn must_be_unique(&self) -> bool {
+        true
+    }
+    fn clone_inner(&self) -> Box<dyn Flag> {
+        Box::new(Edition(self.0.clone()))
+    }
+
+    fn apply(
+        &self,
+        cmd: &mut std::process::Command,
+        _config: &TestConfig,
+        _build_manager: &BuildManager,
+    ) -> Result<(), Errored> {
+        cmd.arg("--edition").arg(&self.0);
+        Ok(())
+    }
+}
diff --git a/src/custom_flags/run.rs b/src/custom_flags/run.rs
@@ -1,15 +1,14 @@
 //! Types used for running tests after they pass compilation
 
-use bstr::ByteSlice;
-use spanned::Spanned;
-use std::{path::Path, process::Output};
-
+use super::Flag;
 use crate::{
     build_manager::BuildManager, display, per_test_config::TestConfig,
-    status_emitter::RevisionStyle, CommandBuilder, Error, Errored, OutputConflictHandling, TestOk, TestRun,
+    status_emitter::RevisionStyle, CommandBuilder, Error, Errored, OutputConflictHandling, TestOk,
+    TestRun,
 };
-
-use super::Flag;
+use bstr::ByteSlice;
+use spanned::Spanned;
+use std::{path::Path, process::Output};
 
 #[derive(Debug, Copy, Clone)]
 /// Run a test after successfully compiling it
diff --git a/src/custom_flags/rustfix.rs b/src/custom_flags/rustfix.rs
@@ -1,24 +1,21 @@
 //! All the logic needed to run rustfix on a test that failed compilation
 
-use std::{
-    collections::HashSet,
-    path::{Path, PathBuf},
-    process::Output,
-    sync::Arc,
-};
-
-use rustfix::{CodeFix, Filter, Suggestion};
-use spanned::{Span, Spanned};
-
+use super::Flag;
 use crate::{
     build_manager::BuildManager,
     display,
     parser::OptWithLine,
     per_test_config::{Comments, Revisioned, TestConfig},
     Error, Errored, TestOk, TestRun,
 };
-
-use super::Flag;
+use rustfix::{CodeFix, Filter, Suggestion};
+use spanned::{Span, Spanned};
+use std::{
+    collections::HashSet,
+    path::{Path, PathBuf},
+    process::Output,
+    sync::Arc,
+};
 
 /// When to run rustfix on tests
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
diff --git a/src/dependencies.rs b/src/dependencies.rs
@@ -1,5 +1,12 @@
 //! Use `cargo` to build dependencies and make them available in your tests
 
+use crate::{
+    build_manager::{Build, BuildManager},
+    custom_flags::Flag,
+    per_test_config::TestConfig,
+    test_result::Errored,
+    CommandBuilder, Config,
+};
 use bstr::ByteSlice;
 use cargo_metadata::{camino::Utf8PathBuf, BuildScript, DependencyKind};
 use cargo_platform::Cfg;
@@ -11,14 +18,6 @@ use std::{
     str::FromStr,
 };
 
-use crate::{
-    build_manager::{Build, BuildManager},
-    custom_flags::Flag,
-    per_test_config::TestConfig,
-    test_result::Errored,
-    CommandBuilder, Config,
-};
-
 #[derive(Default, Debug)]
 /// Describes where to find the binaries built for the dependencies
 pub struct Dependencies {
diff --git a/src/filter.rs b/src/filter.rs
@@ -1,13 +1,12 @@
 //! Datastructures and operations used for normalizing test output.
 
+use crate::display;
 use bstr::ByteSlice;
 use regex::bytes::{Captures, Regex};
 use std::borrow::Cow;
 use std::path::Path;
 use std::sync::OnceLock;
 
-use crate::display;
-
 /// A filter's match rule.
 #[derive(Clone, Debug)]
 pub enum Match {
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,6 +7,7 @@
 #![deny(missing_docs)]
 #![doc = include_str!("../README.md")]
 
+use crate::parser::Comments;
 use build_manager::BuildManager;
 use build_manager::NewJob;
 pub use color_eyre;
@@ -34,8 +35,6 @@ use std::sync::Arc;
 use test_result::TestRun;
 pub use test_result::{Errored, TestOk};
 
-use crate::parser::Comments;
-
 pub mod aux_builds;
 pub mod build_manager;
 mod cmd;
@@ -64,7 +63,6 @@ mod tests;
 pub use cmd::*;
 pub use config::*;
 pub use error::*;
-
 pub use spanned;
 
 /// Run all tests as described in the config argument.
diff --git a/src/mode.rs b/src/mode.rs
@@ -1,8 +1,6 @@
-use spanned::Spanned;
-
-use crate::{per_test_config::TestConfig, Errored};
-
 use super::Error;
+use crate::{per_test_config::TestConfig, Errored};
+use spanned::Spanned;
 use std::process::ExitStatus;
 
 impl TestConfig {
diff --git a/src/parser.rs b/src/parser.rs
@@ -1,18 +1,14 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    num::NonZeroUsize,
-};
-
-use bstr::{ByteSlice, Utf8Error};
-use regex::bytes::Regex;
-
 use crate::{
     custom_flags::Flag, diagnostics::Level, filter::Match, test_result::Errored, Config, Error,
 };
-
+use bstr::{ByteSlice, Utf8Error};
 use color_eyre::eyre::Result;
-
+use regex::bytes::Regex;
 pub(crate) use spanned::*;
+use std::{
+    collections::{BTreeMap, HashMap},
+    num::NonZeroUsize,
+};
 
 mod spanned;
 #[cfg(test)]
diff --git a/src/parser/tests.rs b/src/parser/tests.rs
@@ -1,13 +1,10 @@
-use std::path::PathBuf;
-
-use spanned::{Span, Spanned};
-
+use super::Comments;
 use crate::{
     parser::{Condition, ErrorMatchKind, Pattern},
     Config, Error,
 };
-
-use super::Comments;
+use spanned::{Span, Spanned};
+use std::path::PathBuf;
 
 macro_rules! line {
     ($thing:expr, $s:expr) => {{
diff --git a/src/per_test_config.rs b/src/per_test_config.rs
@@ -3,15 +3,6 @@
 //! in the files. These comments still overwrite the defaults, although
 //! some boolean settings have no way to disable them.
 
-use std::collections::btree_map::Entry;
-use std::collections::BTreeMap;
-use std::num::NonZeroUsize;
-use std::path::PathBuf;
-use std::process::{Command, Output};
-use std::sync::Arc;
-
-use spanned::Spanned;
-
 use crate::build_manager::BuildManager;
 use crate::custom_flags::Flag;
 pub use crate::diagnostics::Level;
@@ -21,6 +12,13 @@ use crate::parser::{ErrorMatch, ErrorMatchKind, OptWithLine};
 use crate::status_emitter::{SilentStatus, TestStatus};
 use crate::test_result::{Errored, TestOk, TestResult};
 use crate::{core::strip_path_prefix, Config, Error, Errors};
+use spanned::Spanned;
+use std::collections::btree_map::Entry;
+use std::collections::BTreeMap;
+use std::num::NonZeroUsize;
+use std::path::PathBuf;
+use std::process::{Command, Output};
+use std::sync::Arc;
 
 /// All information needed to run a single test
 pub struct TestConfig {
diff --git a/src/rustc_stderr.rs b/src/rustc_stderr.rs
@@ -1,10 +1,9 @@
+use crate::diagnostics::{Diagnostics, Message};
 use bstr::ByteSlice;
 use cargo_metadata::diagnostic::{Diagnostic, DiagnosticSpan};
 use regex::Regex;
 use std::path::{Path, PathBuf};
 
-use crate::diagnostics::{Diagnostics, Message};
-
 fn diag_line(diag: &Diagnostic, file: &Path) -> Option<(spanned::Span, usize)> {
     let span = |primary| {
         diag.spans
diff --git a/src/status_emitter.rs b/src/status_emitter.rs
diff --git a/src/status_emitter/debug.rs b/src/status_emitter/debug.rs
diff --git a/src/test_result.rs b/src/test_result.rs
diff --git a/src/tests.rs b/src/tests.rs
diff --git a/tests/integration.rs b/tests/integration.rs
