@@ -73,7 +73,7 @@ mod vtable;
73
73
mod prelude {
74
74
pub ( crate ) use std:: convert:: { TryFrom , TryInto } ;
75
75
76
- pub ( crate ) use rustc_span:: { Span , FileNameDisplayPreference } ;
76
+ pub ( crate ) use rustc_span:: { FileNameDisplayPreference , Span } ;
77
77
78
78
pub ( crate ) use rustc_hir:: def_id:: { DefId , LOCAL_CRATE } ;
79
79
pub ( crate ) use rustc_middle:: bug;
@@ -275,21 +275,19 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Box<dyn isa::Tar
275
275
}
276
276
Some ( value) => {
277
277
let mut builder =
278
- cranelift_codegen:: isa:: lookup ( target_triple. clone ( ) )
279
- . unwrap_or_else ( |err| {
280
- sess. fatal ( & format ! ( "can't compile for {}: {}" , target_triple, err) ) ;
281
- } ) ;
278
+ cranelift_codegen:: isa:: lookup ( target_triple. clone ( ) ) . unwrap_or_else ( |err| {
279
+ sess. fatal ( & format ! ( "can't compile for {}: {}" , target_triple, err) ) ;
280
+ } ) ;
282
281
if let Err ( _) = builder. enable ( value) {
283
282
sess. fatal ( "the specified target cpu isn't currently supported by Cranelift." ) ;
284
283
}
285
284
builder
286
285
}
287
286
None => {
288
287
let mut builder =
289
- cranelift_codegen:: isa:: lookup ( target_triple. clone ( ) )
290
- . unwrap_or_else ( |err| {
291
- sess. fatal ( & format ! ( "can't compile for {}: {}" , target_triple, err) ) ;
292
- } ) ;
288
+ cranelift_codegen:: isa:: lookup ( target_triple. clone ( ) ) . unwrap_or_else ( |err| {
289
+ sess. fatal ( & format ! ( "can't compile for {}: {}" , target_triple, err) ) ;
290
+ } ) ;
293
291
if target_triple. architecture == target_lexicon:: Architecture :: X86_64 {
294
292
// Don't use "haswell" as the default, as it implies `has_lzcnt`.
295
293
// macOS CI is still at Ivy Bridge EP, so `lzcnt` is interpreted as `bsr`.
0 commit comments