diff options
| author | ljedrz <ljedrz@gmail.com> | 2018-12-06 16:39:19 +0100 |
|---|---|---|
| committer | ljedrz <ljedrz@gmail.com> | 2018-12-06 21:14:23 +0100 |
| commit | adaeb10b5bec3e5a344fbcd90c27204ecb221c80 (patch) | |
| tree | 9c9852ef4274ed02377d8c82a5176f7e30c53dfd /src/librustc_codegen_utils/codegen_backend.rs | |
| parent | 367e783e6f66a4dba32decdc68a262953d2f3f1b (diff) | |
| download | rust-adaeb10b5bec3e5a344fbcd90c27204ecb221c80.tar.gz rust-adaeb10b5bec3e5a344fbcd90c27204ecb221c80.zip | |
codegen_utils, driver: fix clippy errors
Diffstat (limited to 'src/librustc_codegen_utils/codegen_backend.rs')
| -rw-r--r-- | src/librustc_codegen_utils/codegen_backend.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs index 046f0cccfee..b328873800e 100644 --- a/src/librustc_codegen_utils/codegen_backend.rs +++ b/src/librustc_codegen_utils/codegen_backend.rs @@ -86,8 +86,8 @@ impl MetadataLoader for NoLlvmMetadataLoader { let mut buf = Vec::new(); io::copy(&mut file, &mut buf).unwrap(); - let buf: OwningRef<Vec<u8>, [u8]> = OwningRef::new(buf).into(); - return Ok(rustc_erase_owner!(buf.map_owner_box())); + let buf: OwningRef<Vec<u8>, [u8]> = OwningRef::new(buf); + Ok(rustc_erase_owner!(buf.map_owner_box())) } fn get_dylib_metadata(&self, target: &Target, filename: &Path) -> Result<MetadataRef, String> { @@ -103,7 +103,7 @@ pub struct OngoingCodegen { } impl MetadataOnlyCodegenBackend { - pub fn new() -> Box<dyn CodegenBackend> { + pub fn boxed() -> Box<dyn CodegenBackend> { box MetadataOnlyCodegenBackend(()) } } @@ -165,15 +165,12 @@ impl CodegenBackend for MetadataOnlyCodegenBackend { tcx, collector::MonoItemCollectionMode::Eager ).0 { - match mono_item { - MonoItem::Fn(inst) => { - let def_id = inst.def_id(); - if def_id.is_local() { - let _ = inst.def.is_inline(tcx); - let _ = tcx.codegen_fn_attrs(def_id); - } + if let MonoItem::Fn(inst) = mono_item { + let def_id = inst.def_id(); + if def_id.is_local() { + let _ = inst.def.is_inline(tcx); + let _ = tcx.codegen_fn_attrs(def_id); } - _ => {} } } tcx.sess.abort_if_errors(); @@ -181,7 +178,7 @@ impl CodegenBackend for MetadataOnlyCodegenBackend { let metadata = tcx.encode_metadata(); box OngoingCodegen { - metadata: metadata, + metadata, metadata_version: tcx.metadata_encoding_version().to_vec(), crate_name: tcx.crate_name(LOCAL_CRATE), } |
