revert: drop rustfmt-only refactor from this PR

Author: Stevengre

src/bin/cargo_stable_mir_json.rs

@@ -1,12 +1,10 @@
-use {
-    anyhow::{bail, Result},
-    std::{
-        env,
-        io::Write,
-        os::unix::fs::PermissionsExt,
-        path::{Path, PathBuf},
-    },
-};
+use std::env;
+
+use std::io::Write;
+use std::os::unix::fs::PermissionsExt;
+use std::path::{Path, PathBuf};
+
+use anyhow::{bail, Result};
 
 fn main() -> Result<()> {
     let args: Vec<_> = env::args().collect();

src/driver.rs

@@ -1,7 +1,7 @@
 //! This module provides a compiler driver such that:
 //!
-//! 1. the rustc compiler context is available
-//! 2. the rustc `stable_mir` APIs are available
+//! 1.  the rustc compiler context is available
+//! 2.  the rustc `stable_mir` APIs are available
 //!
 //! It exports a single function:
 //!
@@ -22,10 +22,10 @@ extern crate rustc_interface;
 extern crate rustc_middle;
 extern crate rustc_session;
 extern crate rustc_smir;
-use {
-    rustc_driver::Compilation, rustc_interface::interface::Compiler, rustc_middle::ty::TyCtxt,
-    rustc_smir::rustc_internal,
-};
+use rustc_driver::Compilation;
+use rustc_interface::interface::Compiler;
+use rustc_middle::ty::TyCtxt;
+use rustc_smir::rustc_internal;
 
 struct StableMirCallbacks {
     callback_fn: fn(TyCtxt) -> (),

src/lib.rs

@@ -2,4 +2,5 @@
 pub mod driver;
 pub mod mk_graph;
 pub mod printer;
-pub use {driver::stable_mir_driver, printer::*};
+pub use driver::stable_mir_driver;
+pub use printer::*;

src/main.rs

@@ -2,11 +2,9 @@
 use std::env;
 pub mod driver;
 pub mod printer;
-use {
-    driver::stable_mir_driver,
-    printer::emit_smir,
-    stable_mir_json::mk_graph::{emit_d2file, emit_dotfile},
-};
+use driver::stable_mir_driver;
+use printer::emit_smir;
+use stable_mir_json::mk_graph::{emit_d2file, emit_dotfile};
 
 fn main() {
     let mut args: Vec<String> = env::args().collect();

src/mk_graph/context.rs

@@ -3,20 +3,16 @@
 use std::collections::HashMap;
 
 extern crate stable_mir;
-use {
-    super::{
-        index::{AllocIndex, LayoutInfo, TypeEntry, TypeIndex, TypeKind},
-        util::{function_string, short_fn_name, GraphLabelString},
-    },
-    crate::printer::SmirJson,
-    stable_mir::{
-        mir::{
-            BorrowKind, ConstOperand, Mutability, NonDivergingIntrinsic, Operand, Rvalue,
-            Statement, StatementKind, Terminator, TerminatorKind,
-        },
-        ty::{ConstantKind, IndexedVal, MirConst, Ty},
-    },
+use stable_mir::mir::{
+    BorrowKind, ConstOperand, Mutability, NonDivergingIntrinsic, Operand, Rvalue, Statement,
+    StatementKind, Terminator, TerminatorKind,
 };
+use stable_mir::ty::{ConstantKind, IndexedVal, MirConst, Ty};
+
+use crate::printer::SmirJson;
+
+use super::index::{AllocIndex, LayoutInfo, TypeEntry, TypeIndex, TypeKind};
+use super::util::{function_string, short_fn_name, GraphLabelString};
 
 // =============================================================================
 // GraphContext
@@ -116,8 +112,7 @@ impl GraphContext {
         lines
     }
 
-    /// Resolve a call target to a function name if it's a constant function
-    /// pointer
+    /// Resolve a call target to a function name if it's a constant function pointer
     pub fn resolve_call_target(&self, func: &Operand) -> Option<String> {
         match func {
             Operand::Constant(ConstOperand { const_, .. }) => {

src/mk_graph/index.rs

@@ -3,15 +3,12 @@
 use std::collections::HashMap;
 
 extern crate stable_mir;
-use {
-    crate::printer::{AllocInfo, TypeMetadata},
-    stable_mir::{
-        abi::{FieldsShape, LayoutShape},
-        mir::alloc::GlobalAlloc,
-        ty::{IndexedVal, Ty},
-        CrateDef,
-    },
-};
+use stable_mir::abi::{FieldsShape, LayoutShape};
+use stable_mir::mir::alloc::GlobalAlloc;
+use stable_mir::ty::{IndexedVal, Ty};
+use stable_mir::CrateDef;
+
+use crate::printer::{AllocInfo, TypeMetadata};
 
 // =============================================================================
 // Index Structures
@@ -326,8 +323,7 @@ impl TypeEntry {
                             .iter()
                             .map(|&t| FieldInfo {
                                 ty: t,
-                                offset: None, /* Enum variant offsets require variant-specific
-                                               * layout */
+                                offset: None, // Enum variant offsets require variant-specific layout
                             })
                             .collect(),
                     })

src/mk_graph/mod.rs

@@ -3,19 +3,16 @@
 //! This module provides functionality to generate graph visualizations
 //! of Rust's MIR in various formats (DOT, D2).
 
-use std::{
-    fs::File,
-    io::{self, Write},
-};
+use std::fs::File;
+use std::io::{self, Write};
 
 extern crate rustc_middle;
 use rustc_middle::ty::TyCtxt;
 
 extern crate rustc_session;
-use {
-    crate::printer::collect_smir,
-    rustc_session::config::{OutFileName, OutputType},
-};
+use rustc_session::config::{OutFileName, OutputType};
+
+use crate::printer::collect_smir;
 
 // Sub-modules
 pub mod context;
@@ -24,11 +21,9 @@ pub mod output;
 pub mod util;
 
 // Re-exports for convenience
-pub use {
-    context::GraphContext,
-    index::{AllocEntry, AllocIndex, AllocKind, TypeIndex},
-    util::GraphLabelString,
-};
+pub use context::GraphContext;
+pub use index::{AllocEntry, AllocIndex, AllocKind, TypeIndex};
+pub use util::GraphLabelString;
 
 // =============================================================================
 // Entry Points

src/mk_graph/output/d2.rs

@@ -1,16 +1,14 @@
 //! D2 diagram format output for MIR graphs.
 
 extern crate stable_mir;
-use {
-    crate::{
-        mk_graph::{
-            context::GraphContext,
-            util::{escape_d2, is_unqualified, name_lines, short_name, terminator_targets},
-        },
-        printer::SmirJson,
-        MonoItemKind,
-    },
-    stable_mir::mir::TerminatorKind,
+use stable_mir::mir::TerminatorKind;
+
+use crate::printer::SmirJson;
+use crate::MonoItemKind;
+
+use crate::mk_graph::context::GraphContext;
+use crate::mk_graph::util::{
+    escape_d2, is_unqualified, name_lines, short_name, terminator_targets,
 };
 
 impl SmirJson<'_> {

src/mk_graph/output/dot.rs

@@ -1,22 +1,17 @@
 //! DOT (Graphviz) format output for MIR graphs.
 
-use {
-    dot_writer::{Attributes, Color, DotWriter, Scope, Shape, Style},
-    std::collections::HashSet,
-};
+use std::collections::HashSet;
+
+use dot_writer::{Attributes, Color, DotWriter, Scope, Shape, Style};
 
 extern crate stable_mir;
-use {
-    crate::{
-        mk_graph::{
-            context::GraphContext,
-            util::{block_name, is_unqualified, name_lines, short_name, GraphLabelString},
-        },
-        printer::SmirJson,
-        MonoItemKind,
-    },
-    stable_mir::mir::{BasicBlock, ConstOperand, Operand, TerminatorKind, UnwindAction},
-};
+use stable_mir::mir::{BasicBlock, ConstOperand, Operand, TerminatorKind, UnwindAction};
+
+use crate::printer::SmirJson;
+use crate::MonoItemKind;
+
+use crate::mk_graph::context::GraphContext;
+use crate::mk_graph::util::{block_name, is_unqualified, name_lines, short_name, GraphLabelString};
 
 impl SmirJson<'_> {
     /// Convert the MIR to DOT (Graphviz) format
@@ -96,8 +91,7 @@ impl SmirJson<'_> {
                         local_node.set("color", "palegreen3", false);
                         drop(local_node);
 
-                        // Cannot define local functions that capture env. variables. Instead we
-                        // define _closures_.
+                        // Cannot define local functions that capture env. variables. Instead we define _closures_.
                         let process_block =
                             |cluster: &mut Scope<'_, '_>, node_id: usize, b: &BasicBlock| {
                                 let name = &item.symbol_name;
@@ -179,11 +173,8 @@ impl SmirJson<'_> {
                                                 .set_label(&dest);
                                         }
 
-                                        // The call edge has to be drawn outside
-                                        // the cluster, outside this function
-                                        // (cluster borrows &mut graph)!
-                                        // Code for that is therefore separated
-                                        // into its own second function below.
+                                        // The call edge has to be drawn outside the cluster, outside this function (cluster borrows &mut graph)!
+                                        // Code for that is therefore separated into its own second function below.
                                     }
                                     Assert {
                                         cond,
@@ -244,10 +235,9 @@ impl SmirJson<'_> {
 
                         drop(c); // so we can borrow graph again
 
-                        // call edges have to be added _outside_ the cluster of blocks for one
-                        // function because they go between different
-                        // clusters. Due to a scope/borrow issue, we have to
-                        // make a 2nd pass over the bodies of the item.
+                        // call edges have to be added _outside_ the cluster of blocks for one function
+                        // because they go between different clusters. Due to a scope/borrow issue, we have
+                        // to make a 2nd pass over the bodies of the item.
                         let add_call_edges =
                             |graph: &mut Scope<'_, '_>, offset: usize, bs: &Vec<BasicBlock>| {
                                 for (i, b) in bs.iter().enumerate() {
@@ -262,17 +252,15 @@ impl SmirJson<'_> {
                                                     if let Some(callee) =
                                                         ctx.functions.get(&const_.ty())
                                                     {
-                                                        // callee node/body will be added when its
-                                                        // body is added, missing ones added before
+                                                        // callee node/body will be added when its body is added, missing ones added before
                                                         graph.edge(
                                                             &this_block,
                                                             block_name(callee, 0),
                                                         )
                                                     } else {
                                                         let unknown = format!("{}", const_.ty());
                                                         // pathological case, could panic! instead.
-                                                        // all unknown callees will be collapsed
-                                                        // into one `unknown` node
+                                                        // all unknown callees will be collapsed into one `unknown` node
                                                         graph.edge(&this_block, unknown)
                                                     }
                                                 }

src/mk_graph/util.rs

@@ -3,16 +3,13 @@
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 extern crate stable_mir;
-use {
-    crate::printer::FnSymType,
-    stable_mir::{
-        mir::{
-            AggregateKind, BorrowKind, ConstOperand, Mutability, NonDivergingIntrinsic, NullOp,
-            Operand, Place, ProjectionElem, Rvalue, Terminator, TerminatorKind, UnwindAction,
-        },
-        ty::{IndexedVal, RigidTy},
-    },
+use stable_mir::mir::{
+    AggregateKind, BorrowKind, ConstOperand, Mutability, NonDivergingIntrinsic, NullOp, Operand,
+    Place, ProjectionElem, Rvalue, Terminator, TerminatorKind, UnwindAction,
 };
+use stable_mir::ty::{IndexedVal, RigidTy};
+
+use crate::printer::FnSymType;
 
 // =============================================================================
 // GraphLabelString Trait