Rollup merge of #68473 - nopsledder:rust_sanitizer_fuchsia, r=alexcrichton

[rust.git] / src / librustc_traits / generic_types.rs

diff --git a/src/librustc_traits/generic_types.rs b/src/librustc_traits/generic_types.rs
index 96ba4d497cbf570c3319e875e8c8c5297cc37768..e1a9ec56f8ba52601e334c96b2a10fd9964f65e6 100644 (file)
--- a/src/librustc_traits/generic_types.rs
+++ b/src/librustc_traits/generic_types.rs
@@ -1,24 +1,18 @@
 //! Utilities for creating generic types with bound vars in place of parameter values.
 
+use rustc::ty::subst::{GenericArg, InternalSubsts, SubstsRef};
 use rustc::ty::{self, Ty, TyCtxt};
-use rustc::ty::subst::{GenericArg, SubstsRef, InternalSubsts};
-use rustc::hir;
-use rustc::hir::def_id::DefId;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
 use rustc_target::spec::abi;
 
 crate fn bound(tcx: TyCtxt<'tcx>, index: u32) -> Ty<'tcx> {
-    let ty = ty::Bound(
-        ty::INNERMOST,
-        ty::BoundVar::from_u32(index).into()
-    );
+    let ty = ty::Bound(ty::INNERMOST, ty::BoundVar::from_u32(index).into());
     tcx.mk_ty(ty)
 }
 
 crate fn raw_ptr(tcx: TyCtxt<'tcx>, mutbl: hir::Mutability) -> Ty<'tcx> {
-    tcx.mk_ptr(ty::TypeAndMut {
-        ty: bound(tcx, 0),
-        mutbl,
-    })
+    tcx.mk_ptr(ty::TypeAndMut { ty: bound(tcx, 0), mutbl })
 }
 
 crate fn fn_ptr(
@@ -29,39 +23,31 @@
     abi: abi::Abi,
 ) -> Ty<'tcx> {
     let inputs_and_output = tcx.mk_type_list(
-        (0..arity_and_output).into_iter()
+        (0..arity_and_output)
+            .into_iter()
             .map(|i| ty::BoundVar::from(i))
             // DebruijnIndex(1) because we are going to inject these in a `PolyFnSig`
-            .map(|var| tcx.mk_ty(ty::Bound(ty::DebruijnIndex::from(1usize), var.into())))
+            .map(|var| tcx.mk_ty(ty::Bound(ty::DebruijnIndex::from(1usize), var.into()))),
     );
 
-    let fn_sig = ty::Binder::bind(ty::FnSig {
-        inputs_and_output,
-        c_variadic,
-        unsafety,
-        abi,
-    });
+    let fn_sig = ty::Binder::bind(ty::FnSig { inputs_and_output, c_variadic, unsafety, abi });
     tcx.mk_fn_ptr(fn_sig)
 }
 
 crate fn type_list(tcx: TyCtxt<'tcx>, arity: usize) -> SubstsRef<'tcx> {
     tcx.mk_substs(
-        (0..arity).into_iter()
+        (0..arity)
+            .into_iter()
             .map(|i| ty::BoundVar::from(i))
             .map(|var| tcx.mk_ty(ty::Bound(ty::INNERMOST, var.into())))
-            .map(|ty| GenericArg::from(ty))
+            .map(|ty| GenericArg::from(ty)),
     )
 }
 
 crate fn ref_ty(tcx: TyCtxt<'tcx>, mutbl: hir::Mutability) -> Ty<'tcx> {
-    let region = tcx.mk_region(
-        ty::ReLateBound(ty::INNERMOST, ty::BoundRegion::BrAnon(0))
-    );
+    let region = tcx.mk_region(ty::ReLateBound(ty::INNERMOST, ty::BoundRegion::BrAnon(0)));
 
-    tcx.mk_ref(region, ty::TypeAndMut {
-        ty: bound(tcx, 1),
-        mutbl,
-    })
+    tcx.mk_ref(region, ty::TypeAndMut { ty: bound(tcx, 1), mutbl })
 }
 
 crate fn fn_def(tcx: TyCtxt<'tcx>, def_id: DefId) -> Ty<'tcx> {
@@ -76,6 +62,6 @@
     tcx.mk_generator(
         def_id,
         InternalSubsts::bound_vars_for_item(tcx, def_id),
-        hir::Movability::Movable
+        hir::Movability::Movable,
     )
 }