style fixes as requested by @eddyb

diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs
index dbdca1266af9d3cc910d5f99dcc5a667d0e6ee97..6f1be020c7bd380cbdcaaa6e71b962fd00ef27ed 100644 (file)
--- a/src/librustc/ty/instance.rs
+++ b/src/librustc/ty/instance.rs
@@ -165,8 +165,6 @@ pub fn resolve(tcx: TyCtxt<'a, 'tcx, 'tcx>,
         debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result);
         result
     }
-
-
 }
 
 fn resolve_closure<'a, 'tcx>(

diff --git a/src/librustc_trans/callee.rs b/src/librustc_trans/callee.rs
index 5231a516f62f255a845274b8b84844e38452533f..c5a754719a191597a73b2b7af410cec9703f091f 100644 (file)
--- a/src/librustc_trans/callee.rs
+++ b/src/librustc_trans/callee.rs
@@ -181,7 +181,7 @@ pub fn resolve_and_get_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
                                     -> ValueRef
 {
     get_fn(ccx, ty::Instance::resolve(ccx.tcx(),
-    ty::ParamEnv::empty(traits::Reveal::All),
-    def_id,
-    substs).unwrap())
+           ty::ParamEnv::empty(traits::Reveal::All),
+           def_id,
+           substs).unwrap())
 }

diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs
index 6e27c0dafafd902154c392f0fa622cfabac0ceb3..591aa974666cce89dbff36feafed0bebb0424d6f 100644 (file)
--- a/src/librustc_trans/mir/block.rs
+++ b/src/librustc_trans/mir/block.rs
@@ -431,9 +431,9 @@ fn trans_terminator(&mut self,
                 let (instance, mut llfn) = match callee.ty.sty {
                     ty::TyFnDef(def_id, substs) => {
                         (Some(ty::Instance::resolve(bcx.ccx.tcx(),
-                        ty::ParamEnv::empty(traits::Reveal::All),
-                        def_id,
-                        substs).unwrap()),
+                                                    ty::ParamEnv::empty(traits::Reveal::All),
+                                                    def_id,
+                                                    substs).unwrap()),
                          None)
                     }
                     ty::TyFnPtr(_) => {

diff --git a/src/librustc_trans/mir/constant.rs b/src/librustc_trans/mir/constant.rs
index 1ccf6d256204ff18aa0b0252922e59ac76ffcfad..1b8e68f691ae66c4b3c228f8f0f86d5c6423f808 100644 (file)
--- a/src/librustc_trans/mir/constant.rs
+++ b/src/librustc_trans/mir/constant.rs
@@ -262,9 +262,9 @@ fn trans_def(ccx: &'a CrateContext<'a, 'tcx>,
                  args: IndexVec<mir::Local, Result<Const<'tcx>, ConstEvalErr<'tcx>>>)
                  -> Result<Const<'tcx>, ConstEvalErr<'tcx>> {
         let instance = ty::Instance::resolve(ccx.tcx(),
-        ty::ParamEnv::empty(traits::Reveal::All),
-        def_id,
-        substs).unwrap();
+                                             ty::ParamEnv::empty(traits::Reveal::All),
+                                             def_id,
+                                             substs).unwrap();
         let mir = ccx.tcx().instance_mir(instance.def);
         MirConstContext::new(ccx, &mir, instance.substs, args).trans()
     }