Normalize imports

I.e. using:

   cargo +nightly fmt -- \
     --config group_imports=StdExternalCrate,imports_granularity=crate

Author: jpgrayson

src/cmd/completion/bash.rs

@@ -2,10 +2,10 @@
 
 //! `stg completion bash` implementation.
 
-use anyhow::Result;
-
 use std::{format as f, path::PathBuf};
 
+use anyhow::Result;
+
 use super::shstream::ShStream;
 
 pub(super) fn command() -> clap::Command {

src/cmd/completion/fish.rs

@@ -2,10 +2,10 @@
 
 //! `stg completion fish` implementation
 
-use anyhow::Result;
-
 use std::{format as f, path::PathBuf};
 
+use anyhow::Result;
+
 use super::shstream::ShStream;
 
 pub(super) fn command() -> clap::Command {

src/cmd/new.rs

@@ -8,7 +8,6 @@ use anyhow::{anyhow, Result};
 use clap::{Arg, ArgGroup, ArgMatches};
 
 use super::refresh;
-
 use crate::{
     color::get_color_stdout,
     patchedit,

src/cmd/redo.rs

@@ -5,10 +5,8 @@
 use anyhow::Result;
 use clap::Arg;
 
-use crate::color::get_color_stdout;
-use crate::stack::Stack;
-
 use super::undo::find_undo_state;
+use crate::{color::get_color_stdout, stack::Stack};
 
 pub(super) const STGIT_COMMAND: super::StGitCommand = super::StGitCommand {
     name: "redo",

src/cmd/squash.rs

@@ -2,8 +2,7 @@
 
 //! `stg squash` implementation.
 
-use std::fmt::Write;
-use std::str::FromStr;
+use std::{fmt::Write, str::FromStr};
 
 use anyhow::{anyhow, Result};
 use clap::{Arg, ArgMatches};

src/patchedit/interactive.rs

@@ -2,10 +2,12 @@
 
 //! Functions for conducting interactive patch edit session.
 
-use std::ffi::OsString;
-use std::fs::File;
-use std::io::{BufWriter, Write};
-use std::path::Path;
+use std::{
+    ffi::OsString,
+    fs::File,
+    io::{BufWriter, Write},
+    path::Path,
+};
 
 use anyhow::{anyhow, Result};
 

src/patchedit/mod.rs

@@ -22,6 +22,9 @@ use clap::{
     builder::{self, ValueParser},
     Arg, ArgMatches, ValueHint,
 };
+use description::{DiffBuffer, EditablePatchDescription, EditedPatchDescription};
+pub(crate) use interactive::call_editor;
+use interactive::edit_interactive;
 
 use crate::{
     commit::{CommitExtended, CommitMessage, RepositoryCommitExtended},
@@ -31,10 +34,6 @@ use crate::{
     stupid::Stupid,
 };
 
-use description::{DiffBuffer, EditablePatchDescription, EditedPatchDescription};
-pub(crate) use interactive::call_editor;
-use interactive::edit_interactive;
-
 /// Add patch editing options to a StGit command.
 pub(crate) fn add_args(
     command: clap::Command,

src/stack/access.rs

@@ -3,12 +3,11 @@
 //! The [`StackStateAccess`] trait allows uniform access to stack information for
 //! stack-like objects.
 
-use crate::patchname::PatchName;
-
 use super::{
     iter::{AllPatches, BothPatches},
     state::PatchState,
 };
+use crate::patchname::PatchName;
 
 /// Trait for accessing stack state.
 ///

src/stack/iter.rs

@@ -2,8 +2,7 @@
 
 //! Patch name iterators.
 
-use std::iter::Chain;
-use std::slice::Iter;
+use std::{iter::Chain, slice::Iter};
 
 use crate::patchname::PatchName;
 

src/stack/stack.rs

@@ -2,8 +2,7 @@
 
 //! High-level StGit stack representation.
 
-use std::collections::BTreeMap;
-use std::str::FromStr;
+use std::{collections::BTreeMap, str::FromStr};
 
 use anyhow::{anyhow, Result};