cleanup: fmt

Author: makai410

compiler/rustc_smir/src/stable_mir/unstable/convert/internal.rs

@@ -10,7 +10,6 @@ use rustc_smir::Tables;
 use rustc_span::Symbol;
 use stable_mir::abi::Layout;
 use stable_mir::compiler_interface::BridgeTys;
-use stable_mir::unstable::{RustcInternal, InternalCx};
 use stable_mir::mir::alloc::AllocId;
 use stable_mir::mir::mono::{Instance, MonoItem, StaticDef};
 use stable_mir::mir::{BinOp, Mutability, Place, ProjectionElem, RawPtrKind, Safety, UnOp};
@@ -20,11 +19,11 @@ use stable_mir::ty::{
     GenericArgKind, GenericArgs, IntTy, MirConst, Movability, Pattern, Region, RigidTy, Span,
     TermKind, TraitRef, Ty, TyConst, UintTy, VariantDef, VariantIdx,
 };
+use stable_mir::unstable::{InternalCx, RustcInternal};
 use stable_mir::{CrateItem, CrateNum, DefId, IndexedVal};
 
 use crate::{rustc_smir, stable_mir};
 
-
 impl RustcInternal for CrateItem {
     type T<'tcx> = rustc_span::def_id::DefId;
     fn internal<'tcx>(
@@ -447,9 +446,10 @@ impl RustcInternal for BoundVariableKind {
         match self {
             BoundVariableKind::Ty(kind) => rustc_ty::BoundVariableKind::Ty(match kind {
                 BoundTyKind::Anon => rustc_ty::BoundTyKind::Anon,
-                BoundTyKind::Param(def, symbol) => {
-                    rustc_ty::BoundTyKind::Param(def.0.internal(tables, tcx), Symbol::intern(symbol))
-                }
+                BoundTyKind::Param(def, symbol) => rustc_ty::BoundTyKind::Param(
+                    def.0.internal(tables, tcx),
+                    Symbol::intern(symbol),
+                ),
             }),
             BoundVariableKind::Region(kind) => rustc_ty::BoundVariableKind::Region(match kind {
                 BoundRegionKind::BrAnon => rustc_ty::BoundRegionKind::Anon,
@@ -542,7 +542,10 @@ impl RustcInternal for ExistentialTraitRef {
         tcx: impl InternalCx<'tcx>,
     ) -> Self::T<'tcx> {
         use rustc_smir::context::SmirExistentialTraitRef;
-        tcx.new_from_args(self.def_id.0.internal(tables, tcx), self.generic_args.internal(tables, tcx))
+        tcx.new_from_args(
+            self.def_id.0.internal(tables, tcx),
+            self.generic_args.internal(tables, tcx),
+        )
     }
 }
 

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

@@ -8,16 +8,12 @@
 
 use std::ops::RangeInclusive;
 
-
 use rustc_smir::Tables;
 use rustc_smir::context::SmirCtxt;
-
 use stable_mir::compiler_interface::BridgeTys;
 
-use crate::{rustc_smir, stable_mir};
-
 use super::Stable;
-
+use crate::{rustc_smir, stable_mir};
 
 mod internal;
 mod stable;

compiler/rustc_smir/src/stable_mir/unstable/convert/stable/abi.rs

@@ -13,9 +13,9 @@ use stable_mir::abi::{
     WrappingRange,
 };
 use stable_mir::compiler_interface::BridgeTys;
-use stable_mir::unstable::Stable;
 use stable_mir::target::MachineSize as Size;
 use stable_mir::ty::{Align, VariantIdx};
+use stable_mir::unstable::Stable;
 use stable_mir::{IndexedVal, opaque};
 
 use crate::{rustc_smir, stable_mir};
@@ -211,7 +211,7 @@ impl<'tcx> Stable<'tcx> for rustc_abi::Variants<rustc_abi::FieldIdx, rustc_abi::
                 VariantsShape::Multiple {
                     tag: tag.stable(tables, cx),
                     tag_encoding: tag_encoding.stable(tables, cx),
-                    tag_field: tag_field.stable(tables,cx),
+                    tag_field: tag_field.stable(tables, cx),
                     variants: variants.iter().as_slice().stable(tables, cx),
                 }
             }

compiler/rustc_smir/src/stable_mir/unstable/convert/stable/mir.rs

@@ -6,10 +6,10 @@ use rustc_smir::Tables;
 use rustc_smir::bridge::SmirError;
 use rustc_smir::context::SmirCtxt;
 use stable_mir::compiler_interface::BridgeTys;
-use stable_mir::unstable::Stable;
 use stable_mir::mir::alloc::GlobalAlloc;
 use stable_mir::mir::{ConstOperand, Statement, UserTypeProjection, VarDebugInfoFragment};
 use stable_mir::ty::{Allocation, ConstantKind, MirConst};
+use stable_mir::unstable::Stable;
 use stable_mir::{Error, alloc, opaque};
 
 use crate::{rustc_smir, stable_mir};
@@ -848,7 +848,11 @@ impl<'tcx> Stable<'tcx> for mir::interpret::Allocation {
 
 impl<'tcx> Stable<'tcx> for mir::interpret::AllocId {
     type T = stable_mir::mir::alloc::AllocId;
-    fn stable<'cx>(&self, tables: &mut Tables<'cx, BridgeTys>, _: &SmirCtxt<'cx, BridgeTys>) -> Self::T {
+    fn stable<'cx>(
+        &self,
+        tables: &mut Tables<'cx, BridgeTys>,
+        _: &SmirCtxt<'cx, BridgeTys>,
+    ) -> Self::T {
         tables.create_alloc_id(*self)
     }
 }

compiler/rustc_smir/src/stable_mir/unstable/convert/stable/mod.rs

@@ -86,7 +86,11 @@ impl<'tcx> Stable<'tcx> for rustc_span::Symbol {
 impl<'tcx> Stable<'tcx> for rustc_span::Span {
     type T = stable_mir::ty::Span;
 
-    fn stable<'cx>(&self, tables: &mut Tables<'cx, BridgeTys>, _: &SmirCtxt<'cx, BridgeTys>) -> Self::T {
+    fn stable<'cx>(
+        &self,
+        tables: &mut Tables<'cx, BridgeTys>,
+        _: &SmirCtxt<'cx, BridgeTys>,
+    ) -> Self::T {
         tables.create_span(*self)
     }
 }

compiler/rustc_smir/src/stable_mir/unstable/convert/stable/ty.rs

@@ -6,10 +6,10 @@ use rustc_smir::Tables;
 use rustc_smir::context::SmirCtxt;
 use stable_mir::alloc;
 use stable_mir::compiler_interface::BridgeTys;
-use stable_mir::unstable::Stable;
 use stable_mir::ty::{
     AdtKind, FloatTy, GenericArgs, GenericParamDef, IntTy, Region, RigidTy, TyKind, UintTy,
 };
+use stable_mir::unstable::Stable;
 
 use crate::{rustc_smir, stable_mir};
 
@@ -290,7 +290,11 @@ impl<'tcx> Stable<'tcx> for ty::FnSig<'tcx> {
 impl<'tcx> Stable<'tcx> for ty::BoundTyKind {
     type T = stable_mir::ty::BoundTyKind;
 
-    fn stable<'cx>(&self, tables: &mut Tables<'cx, BridgeTys>, _: &SmirCtxt<'cx, BridgeTys>) -> Self::T {
+    fn stable<'cx>(
+        &self,
+        tables: &mut Tables<'cx, BridgeTys>,
+        _: &SmirCtxt<'cx, BridgeTys>,
+    ) -> Self::T {
         use stable_mir::ty::BoundTyKind;
 
         match self {
@@ -305,7 +309,11 @@ impl<'tcx> Stable<'tcx> for ty::BoundTyKind {
 impl<'tcx> Stable<'tcx> for ty::BoundRegionKind {
     type T = stable_mir::ty::BoundRegionKind;
 
-    fn stable<'cx>(&self, tables: &mut Tables<'cx, BridgeTys>, _: &SmirCtxt<'cx, BridgeTys>) -> Self::T {
+    fn stable<'cx>(
+        &self,
+        tables: &mut Tables<'cx, BridgeTys>,
+        _: &SmirCtxt<'cx, BridgeTys>,
+    ) -> Self::T {
         use stable_mir::ty::BoundRegionKind;
 
         match self {
@@ -1108,7 +1116,11 @@ impl<'tcx> Stable<'tcx> for ty::AssocItem {
 impl<'tcx> Stable<'tcx> for ty::ImplTraitInTraitData {
     type T = stable_mir::ty::ImplTraitInTraitData;
 
-    fn stable<'cx>(&self, tables: &mut Tables<'cx, BridgeTys>, _: &SmirCtxt<'cx, BridgeTys>) -> Self::T {
+    fn stable<'cx>(
+        &self,
+        tables: &mut Tables<'cx, BridgeTys>,
+        _: &SmirCtxt<'cx, BridgeTys>,
+    ) -> Self::T {
         use stable_mir::ty::ImplTraitInTraitData;
         match self {
             ty::ImplTraitInTraitData::Trait { fn_def_id, opaque_def_id } => {

compiler/rustc_smir/src/stable_mir/unstable/mod.rs

@@ -1,20 +1,20 @@
 //! Module that collects the things that have no stability guarantees.
 //!
-//! We want to keep StableMIR definitions and logic separate from 
-//! any sort of conversion and usage of internal rustc code. So we 
+//! We want to keep StableMIR definitions and logic separate from
+//! any sort of conversion and usage of internal rustc code. So we
 //! restrict the usage of internal items to be inside this module.
 
 use rustc_hir::def::DefKind;
 use rustc_middle::ty::{List, Ty, TyCtxt};
 use rustc_middle::{mir, ty};
 use rustc_smir::Tables;
-use rustc_smir::context::{SmirCtxt, SmirExistentialProjection, SmirExistentialTraitRef, SmirTraitRef};
-
+use rustc_smir::context::{
+    SmirCtxt, SmirExistentialProjection, SmirExistentialTraitRef, SmirTraitRef,
+};
 use stable_mir::{CtorKind, ItemKind};
 
-use crate::{rustc_smir, stable_mir};
-
 use super::compiler_interface::BridgeTys;
+use crate::{rustc_smir, stable_mir};
 
 pub(crate) mod convert;
 
@@ -84,15 +84,15 @@ impl<'tcx> InternalCx<'tcx> for TyCtxt<'tcx> {
     fn lifetimes_re_erased(self) -> ty::Region<'tcx> {
         self.lifetimes.re_erased
     }
-    
+
     fn mk_bound_variable_kinds_from_iter<I, T>(self, iter: I) -> T::Output
     where
         I: Iterator<Item = T>,
         T: ty::CollectAndApply<ty::BoundVariableKind, &'tcx List<ty::BoundVariableKind>>,
     {
         TyCtxt::mk_bound_variable_kinds_from_iter(self, iter)
     }
-    
+
     fn mk_place_elems(self, v: &[mir::PlaceElem<'tcx>]) -> &'tcx List<mir::PlaceElem<'tcx>> {
         TyCtxt::mk_place_elems(self, v)
     }
@@ -103,10 +103,10 @@ impl<'tcx> InternalCx<'tcx> for TyCtxt<'tcx> {
 }
 
 /// Trait that defines the methods that are fine to call from [`RustcInternal`].
-/// 
+///
 /// This trait is only for [`RustcInternal`]. Any other other access to rustc's internals
 /// should go through [`crate::rustc_smir::context::SmirCtxt`].
-pub trait InternalCx<'tcx> : Copy + Clone {
+pub trait InternalCx<'tcx>: Copy + Clone {
     fn tcx(self) -> TyCtxt<'tcx>;
 
     fn lift<T: ty::Lift<TyCtxt<'tcx>>>(self, value: T) -> Option<T::Lifted>;