Fix some nits

nagisa · nagisa · commit e18c59fd48a8 · 2017-04-11T16:06:30.000+03:00
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
@@ -530,11 +530,10 @@ impl Session {
             Some(ref c) if c == crate_name => {
                 let fuel = self.optimization_fuel_limit.get();
                 ret = fuel != 0;
-                if fuel == 0 && !self.out_of_fuel.get(){
+                if fuel == 0 && !self.out_of_fuel.get() {
                     println!("optimization-fuel-exhausted: {}", msg());
                     self.out_of_fuel.set(true);
-                }
-                else if fuel > 0{
+                } else if fuel > 0 {
                     self.optimization_fuel_limit.set(fuel-1);
                 }
             }
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
@@ -518,7 +518,9 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
         }
 
         if sess.print_fuel_crate.is_some() {
-            control.compilation_done.callback = box |state| {
+            let old_callback = control.compilation_done.callback;
+            control.compilation_done.callback = box move |state| {
+                old_callback(state);
                 let sess = state.session;
                 println!("Fuel used by {}: {}",
                     sess.print_fuel_crate.as_ref().unwrap(),
diff --git a/src/librustc_trans/intrinsic.rs b/src/librustc_trans/intrinsic.rs
@@ -622,8 +622,8 @@ pub fn trans_intrinsic_call<'a, 'tcx>(bcx: &Builder<'a, 'tcx>,
                         let val = bcx.extract_value(val, i);
                         let lval = LvalueRef::new_sized_ty(llresult, ret_ty,
                                                            Alignment::AbiAligned);
-                        let (dest, _) = lval.trans_field_ptr(bcx, i);
-                        bcx.store(val, dest, None);
+                        let (dest, align) = lval.trans_field_ptr(bcx, i);
+                        bcx.store(val, dest, align.to_align());
                     }
                     C_nil(ccx)
                 }

Original file line number	Diff line number	Diff line change
`@@ -530,11 +530,10 @@ impl Session {`
`530`	`530`	`Some(ref c) if c == crate_name => {`
`531`	`531`	`let fuel = self.optimization_fuel_limit.get();`
`532`	`532`	`ret = fuel != 0;`
`533`		`- if fuel == 0 && !self.out_of_fuel.get(){`
	`533`	`+ if fuel == 0 && !self.out_of_fuel.get() {`
`534`	`534`	`println!("optimization-fuel-exhausted: {}", msg());`
`535`	`535`	`self.out_of_fuel.set(true);`
`536`		`- }`
`537`		`- else if fuel > 0{`
	`536`	`+ } else if fuel > 0 {`
`538`	`537`	`self.optimization_fuel_limit.set(fuel-1);`
`539`	`538`	`}`
`540`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -622,8 +622,8 @@ pub fn trans_intrinsic_call<'a, 'tcx>(bcx: &Builder<'a, 'tcx>,`
`622`	`622`	`let val = bcx.extract_value(val, i);`
`623`	`623`	`let lval = LvalueRef::new_sized_ty(llresult, ret_ty,`
`624`	`624`	`Alignment::AbiAligned);`
`625`		`- let (dest, _) = lval.trans_field_ptr(bcx, i);`
`626`		`- bcx.store(val, dest, None);`
	`625`	`+ let (dest, align) = lval.trans_field_ptr(bcx, i);`
	`626`	`+ bcx.store(val, dest, align.to_align());`
`627`	`627`	`}`
`628`	`628`	`C_nil(ccx)`
`629`	`629`	`}`