@@ -6,26 +6,26 @@ use libc::{c_char, size_t};
6
6
use rustc_codegen_ssa:: back:: write:: { TargetMachineFactoryConfig , TargetMachineFactoryFn } ;
7
7
use rustc_codegen_ssa:: traits:: { DebugInfoCodegenMethods , MiscCodegenMethods } ;
8
8
use rustc_codegen_ssa:: {
9
+ CompiledModule , ModuleCodegen , ModuleKind ,
9
10
back:: write:: { CodegenContext , ModuleConfig } ,
10
11
base:: maybe_create_entry_wrapper,
11
12
mono_item:: MonoItemExt ,
12
13
traits:: { BaseTypeCodegenMethods , ThinBufferMethods } ,
13
- CompiledModule , ModuleCodegen , ModuleKind ,
14
14
} ;
15
15
use rustc_errors:: { DiagCtxtHandle , FatalError } ;
16
16
use rustc_fs_util:: path_to_c_string;
17
17
use rustc_middle:: bug;
18
18
use rustc_middle:: mir:: mono:: { MonoItem , MonoItemData } ;
19
19
use rustc_middle:: { dep_graph, ty:: TyCtxt } ;
20
- use rustc_session:: config:: { self , DebugInfo , OutputType } ;
21
20
use rustc_session:: Session ;
21
+ use rustc_session:: config:: { self , DebugInfo , OutputType } ;
22
22
use rustc_span:: Symbol ;
23
23
use rustc_target:: spec:: { CodeModel , RelocModel } ;
24
24
25
25
use crate :: common:: AsCCharPtr ;
26
26
use crate :: llvm:: { self } ;
27
27
use crate :: override_fns:: define_or_override_fn;
28
- use crate :: { builder:: Builder , context:: CodegenCx , lto:: ThinBuffer , LlvmMod , NvvmCodegenBackend } ;
28
+ use crate :: { LlvmMod , NvvmCodegenBackend , builder:: Builder , context:: CodegenCx , lto:: ThinBuffer } ;
29
29
30
30
pub fn llvm_err ( handle : DiagCtxtHandle , msg : & str ) -> FatalError {
31
31
match llvm:: last_error ( ) {
@@ -121,12 +121,7 @@ pub fn target_machine_factory(
121
121
false ,
122
122
)
123
123
} ;
124
- tm. ok_or_else ( || {
125
- format ! (
126
- "Could not create LLVM TargetMachine for triple: {}" ,
127
- triple
128
- )
129
- } )
124
+ tm. ok_or_else ( || format ! ( "Could not create LLVM TargetMachine for triple: {}" , triple) )
130
125
} )
131
126
}
132
127
@@ -199,8 +194,8 @@ pub(crate) unsafe fn codegen(
199
194
. temp_path ( OutputType :: LlvmAssembly , module_name) ;
200
195
let out = out. to_str ( ) . unwrap ( ) ;
201
196
202
-
203
- let result = llvm:: LLVMRustPrintModule ( llmod, out. as_c_char_ptr ( ) , out. len ( ) , demangle_callback) ;
197
+ let result =
198
+ llvm:: LLVMRustPrintModule ( llmod, out. as_c_char_ptr ( ) , out. len ( ) , demangle_callback) ;
204
199
205
200
result. into_result ( ) . map_err ( |( ) | {
206
201
let msg = format ! ( "failed to write NVVM IR to {}" , out) ;
@@ -262,7 +257,15 @@ pub fn compile_codegen_unit(tcx: TyCtxt<'_>, cgu_name: Symbol) -> (ModuleCodegen
262
257
263
258
let mono_items = cx. codegen_unit . items_in_deterministic_order ( cx. tcx ) ;
264
259
265
- for & ( mono_item, MonoItemData { linkage, visibility, .. } ) in & mono_items {
260
+ for & (
261
+ mono_item,
262
+ MonoItemData {
263
+ linkage,
264
+ visibility,
265
+ ..
266
+ } ,
267
+ ) in & mono_items
268
+ {
266
269
mono_item. predefine :: < Builder < ' _ , ' _ , ' _ > > ( & cx, linkage, visibility) ;
267
270
}
268
271
@@ -294,7 +297,10 @@ pub fn compile_codegen_unit(tcx: TyCtxt<'_>, cgu_name: Symbol) -> (ModuleCodegen
294
297
cx. create_used_variable_impl ( c"llvm.used" , & * cx. used_statics . borrow ( ) ) ;
295
298
}
296
299
if !cx. compiler_used_statics . borrow ( ) . is_empty ( ) {
297
- cx. create_used_variable_impl ( c"llvm.compiler.used" , & * cx. compiler_used_statics . borrow ( ) ) ;
300
+ cx. create_used_variable_impl (
301
+ c"llvm.compiler.used" ,
302
+ & * cx. compiler_used_statics . borrow ( ) ,
303
+ ) ;
298
304
}
299
305
300
306
// Finalize debuginfo
0 commit comments