@@ -22,10 +22,11 @@ impl MetadataLoader for LlvmMetadataLoader {
22
22
// Use ArchiveRO for speed here, it's backed by LLVM and uses mmap
23
23
// internally to read the file. We also avoid even using a memcpy by
24
24
// just keeping the archive along while the metadata is in use.
25
- let archive = ArchiveRO :: open ( filename) . map ( |ar| OwningRef :: new ( Box :: new ( ar) ) ) . map_err ( |e| {
26
- debug ! ( "llvm didn't like `{}`: {}" , filename. display( ) , e) ;
27
- format ! ( "failed to read rlib metadata in '{}': {}" , filename. display( ) , e)
28
- } ) ?;
25
+ let archive =
26
+ ArchiveRO :: open ( filename) . map ( |ar| OwningRef :: new ( Box :: new ( ar) ) ) . map_err ( |e| {
27
+ debug ! ( "llvm didn't like `{}`: {}" , filename. display( ) , e) ;
28
+ format ! ( "failed to read rlib metadata in '{}': {}" , filename. display( ) , e)
29
+ } ) ?;
29
30
let buf: OwningRef < _ , [ u8 ] > = archive. try_map ( |ar| {
30
31
ar. iter ( )
31
32
. filter_map ( |s| s. ok ( ) )
@@ -44,9 +45,10 @@ impl MetadataLoader for LlvmMetadataLoader {
44
45
let buf = path_to_c_string ( filename) ;
45
46
let mb = llvm:: LLVMRustCreateMemoryBufferWithContentsOfFile ( buf. as_ptr ( ) )
46
47
. ok_or_else ( || format ! ( "error reading library: '{}'" , filename. display( ) ) ) ?;
47
- let of = ObjectFile :: new ( mb) . map ( |of| OwningRef :: new ( Box :: new ( of) ) ) . ok_or_else ( || {
48
- format ! ( "provided path not an object file: '{}'" , filename. display( ) )
49
- } ) ?;
48
+ let of =
49
+ ObjectFile :: new ( mb) . map ( |of| OwningRef :: new ( Box :: new ( of) ) ) . ok_or_else ( || {
50
+ format ! ( "provided path not an object file: '{}'" , filename. display( ) )
51
+ } ) ?;
50
52
let buf = of. try_map ( |of| search_meta_section ( of, target, filename) ) ?;
51
53
Ok ( rustc_erase_owner ! ( buf) )
52
54
}
0 commit comments