@@ -670,11 +670,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
670
670
let step3 = self . or ( left, right) ;
671
671
672
672
// 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) }
678
674
}
679
675
128 => {
680
676
// TODO(antoyo): find a more efficient implementation?
@@ -1225,7 +1221,7 @@ fn get_rust_try_fn<'a, 'gcc, 'tcx>(
1225
1221
iter:: once ( i8p) ,
1226
1222
tcx. types . unit ,
1227
1223
false ,
1228
- rustc_hir:: Unsafety :: Unsafe ,
1224
+ rustc_hir:: Safety :: Unsafe ,
1229
1225
Abi :: Rust ,
1230
1226
) ) ,
1231
1227
) ;
@@ -1236,7 +1232,7 @@ fn get_rust_try_fn<'a, 'gcc, 'tcx>(
1236
1232
[ i8p, i8p] . iter ( ) . cloned ( ) ,
1237
1233
tcx. types . unit ,
1238
1234
false ,
1239
- rustc_hir:: Unsafety :: Unsafe ,
1235
+ rustc_hir:: Safety :: Unsafe ,
1240
1236
Abi :: Rust ,
1241
1237
) ) ,
1242
1238
) ;
@@ -1245,7 +1241,7 @@ fn get_rust_try_fn<'a, 'gcc, 'tcx>(
1245
1241
[ try_fn_ty, i8p, catch_fn_ty] ,
1246
1242
tcx. types . i32 ,
1247
1243
false ,
1248
- rustc_hir:: Unsafety :: Unsafe ,
1244
+ rustc_hir:: Safety :: Unsafe ,
1249
1245
Abi :: Rust ,
1250
1246
) ) ;
1251
1247
let rust_try = gen_fn ( cx, "__rust_try" , rust_fn_sig, codegen) ;
0 commit comments