Reorder imports and remove re-export

compiler/rustc_smir/src/rustc_smir/convert/mir.rs

@@ -1,5 +1,5 @@
 //! Conversion of internal Rust compiler `mir` items to stable ones.
-use crate::rustc_smir::{alloc, Stable, Tables};
+
 use rustc_middle::mir;
 use rustc_middle::mir::interpret::alloc_range;
 use rustc_middle::mir::mono::MonoItem;
@@ -8,6 +8,8 @@ use stable_mir::mir::{ConstOperand, Statement, UserTypeProjection, VarDebugInfoF
 use stable_mir::ty::{Allocation, Const, ConstantKind};
 use stable_mir::{opaque, Error};
 
+use crate::rustc_smir::{alloc, Stable, Tables};
+
 impl<'tcx> Stable<'tcx> for mir::Body<'tcx> {
     type T = stable_mir::mir::Body;
 

compiler/rustc_smir/src/rustc_smir/convert/mod.rs

@@ -1,8 +1,10 @@
 //! Conversion of internal Rust compiler items to stable ones.
-use crate::rustc_smir::{Stable, Tables};
+
 use rustc_target::abi::FieldIdx;
 use stable_mir::mir::VariantIdx;
 
+use crate::rustc_smir::{Stable, Tables};
+
 mod mir;
 mod ty;
 

compiler/rustc_smir/src/rustc_smir/convert/ty.rs

@@ -1,13 +1,14 @@
 //! Conversion of internal Rust compiler `ty` items to stable ones.
 
-use crate::rustc_smir::{alloc, Stable, Tables};
 use rustc_middle::ty::Ty;
 use rustc_middle::{mir, ty};
 use stable_mir::ty::{
     AdtKind, Const, ConstantKind, FloatTy, GenericArgs, GenericParamDef, IntTy, Region, RigidTy,
     TyKind, UintTy,
 };
 
+use crate::rustc_smir::{alloc, Stable, Tables};
+
 impl<'tcx> Stable<'tcx> for ty::AliasKind {
     type T = stable_mir::ty::AliasKind;
     fn stable(&self, _: &mut Tables<'tcx>) -> Self::T {

compiler/stable_mir/src/compiler_interface.rs

@@ -3,6 +3,8 @@
 //! StableMIR users should not use any of the items in this module directly.
 //! These APIs have no stability guarantee.
 
+use std::cell::Cell;
+
 use crate::mir::alloc::{AllocId, GlobalAlloc};
 use crate::mir::mono::{Instance, InstanceDef, StaticDef};
 use crate::mir::Body;
@@ -15,7 +17,6 @@ use crate::{
     mir, Crate, CrateItem, CrateItems, DefId, Error, Filename, ImplTraitDecls, ItemKind, Symbol,
     TraitDecls,
 };
-use std::cell::Cell;
 
 /// This trait defines the interface between stable_mir and the Rust compiler.
 /// Do not use this directly.

compiler/stable_mir/src/lib.rs

@@ -17,20 +17,21 @@
 //! The goal is to eventually be published on
 //! [crates.io](https://crates.io).
 
-use self::ty::{ImplDef, ImplTrait, IndexedVal, Span, TraitDecl, TraitDef, Ty};
-pub(crate) use crate::compiler_interface::with;
+#[macro_use]
+extern crate scoped_tls;
+
+use std::fmt;
+use std::fmt::Debug;
+use std::io;
+
+use crate::compiler_interface::with;
 pub use crate::crate_def::CrateDef;
 pub use crate::crate_def::DefId;
+pub use crate::error::*;
 use crate::mir::pretty::function_name;
 use crate::mir::Body;
 use crate::mir::Mutability;
-pub use error::*;
-use std::fmt;
-use std::fmt::Debug;
-use std::io;
-
-#[macro_use]
-extern crate scoped_tls;
+use crate::ty::{ImplDef, ImplTrait, IndexedVal, Span, TraitDecl, TraitDef, Ty};
 
 #[macro_use]
 pub mod crate_def;