@@ -670,11 +670,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
670670 let step3 = self . or ( left, right) ;
671671
672672 // Fourth step.
673- if width == 8 {
674- step3
675- } else {
676- self . gcc_bswap ( step3, width)
677- }
673+ if width == 8 { step3 } else { self . gcc_bswap ( step3, width) }
678674 }
679675 128 => {
680676 // TODO(antoyo): find a more efficient implementation?
@@ -1225,7 +1221,7 @@ fn get_rust_try_fn<'a, 'gcc, 'tcx>(
12251221 iter:: once ( i8p) ,
12261222 tcx. types . unit ,
12271223 false ,
1228- rustc_hir:: Unsafety :: Unsafe ,
1224+ rustc_hir:: Safety :: Unsafe ,
12291225 Abi :: Rust ,
12301226 ) ) ,
12311227 ) ;
@@ -1236,7 +1232,7 @@ fn get_rust_try_fn<'a, 'gcc, 'tcx>(
12361232 [ i8p, i8p] . iter ( ) . cloned ( ) ,
12371233 tcx. types . unit ,
12381234 false ,
1239- rustc_hir:: Unsafety :: Unsafe ,
1235+ rustc_hir:: Safety :: Unsafe ,
12401236 Abi :: Rust ,
12411237 ) ) ,
12421238 ) ;
@@ -1245,7 +1241,7 @@ fn get_rust_try_fn<'a, 'gcc, 'tcx>(
12451241 [ try_fn_ty, i8p, catch_fn_ty] ,
12461242 tcx. types . i32 ,
12471243 false ,
1248- rustc_hir:: Unsafety :: Unsafe ,
1244+ rustc_hir:: Safety :: Unsafe ,
12491245 Abi :: Rust ,
12501246 ) ) ;
12511247 let rust_try = gen_fn ( cx, "__rust_try" , rust_fn_sig, codegen) ;
0 commit comments