@@ -157,28 +157,36 @@ pub use no_llvm_metadata_loader::NoLLvmMetadataLoader as MetadataLoader;
157
157
pub use rustc_trans:: LlvmMetadataLoader as MetadataLoader ;
158
158
159
159
#[ cfg( not( feature="llvm" ) ) ]
160
- mod no_llvm_metadata_loader{
160
+ mod no_llvm_metadata_loader {
161
161
extern crate ar;
162
162
extern crate owning_ref;
163
-
163
+
164
164
use rustc:: middle:: cstore:: MetadataLoader as MetadataLoaderTrait ;
165
165
use rustc_back:: target:: Target ;
166
166
use std:: io;
167
167
use std:: fs:: File ;
168
168
use std:: path:: Path ;
169
-
169
+
170
170
use self :: ar:: Archive ;
171
171
use self :: owning_ref:: { OwningRef , ErasedBoxRef } ;
172
172
173
173
pub struct NoLLvmMetadataLoader ;
174
174
175
175
impl MetadataLoaderTrait for NoLLvmMetadataLoader {
176
- fn get_rlib_metadata ( & self , _: & Target , filename : & Path ) -> Result < ErasedBoxRef < [ u8 ] > , String > {
177
- let file = File :: open ( filename) . map_err ( |e|format ! ( "metadata file open err: {:?}" , e) ) ?;
176
+ fn get_rlib_metadata (
177
+ & self ,
178
+ _: & Target ,
179
+ filename : & Path
180
+ ) -> Result < ErasedBoxRef < [ u8 ] > , String > {
181
+ let file = File :: open ( filename) . map_err ( |e| {
182
+ format ! ( "metadata file open err: {:?}" , e)
183
+ } ) ?;
178
184
let mut archive = Archive :: new ( file) ;
179
185
180
186
while let Some ( entry_result) = archive. next_entry ( ) {
181
- let mut entry = entry_result. map_err ( |e|format ! ( "metadata section read err: {:?}" , e) ) ?;
187
+ let mut entry = entry_result. map_err ( |e| {
188
+ format ! ( "metadata section read err: {:?}" , e)
189
+ } ) ?;
182
190
if entry. header ( ) . identifier ( ) == "rust.metadata.bin" {
183
191
let mut buf = Vec :: new ( ) ;
184
192
io:: copy ( & mut entry, & mut buf) . unwrap ( ) ;
0 commit comments