Skip to content

Commit 6135b2d

Browse files
committed
Fix tidy errors
1 parent 0c97bbf commit 6135b2d

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/librustc_driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ pub fn compile_input(sess: &Session,
9595

9696
if sess.opts.crate_types.iter().all(|&t|{
9797
t != CrateType::CrateTypeRlib && t != CrateType::CrateTypeExecutable
98-
}) {
98+
}) && !sess.opts.crate_types.is_empty() {
9999
sess.err(
100100
"LLVM is not supported by this rustc, so non rlib libraries are not supported"
101101
);

src/librustc_driver/lib.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,28 +157,36 @@ pub use no_llvm_metadata_loader::NoLLvmMetadataLoader as MetadataLoader;
157157
pub use rustc_trans::LlvmMetadataLoader as MetadataLoader;
158158

159159
#[cfg(not(feature="llvm"))]
160-
mod no_llvm_metadata_loader{
160+
mod no_llvm_metadata_loader {
161161
extern crate ar;
162162
extern crate owning_ref;
163-
163+
164164
use rustc::middle::cstore::MetadataLoader as MetadataLoaderTrait;
165165
use rustc_back::target::Target;
166166
use std::io;
167167
use std::fs::File;
168168
use std::path::Path;
169-
169+
170170
use self::ar::Archive;
171171
use self::owning_ref::{OwningRef, ErasedBoxRef};
172172

173173
pub struct NoLLvmMetadataLoader;
174174

175175
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+
})?;
178184
let mut archive = Archive::new(file);
179185

180186
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+
})?;
182190
if entry.header().identifier() == "rust.metadata.bin" {
183191
let mut buf = Vec::new();
184192
io::copy(&mut entry, &mut buf).unwrap();

0 commit comments

Comments
 (0)