diff options
| author | bors <bors@rust-lang.org> | 2018-04-23 08:26:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-23 08:26:23 +0000 |
| commit | 1fac3ca9c4e4ba3d27a9ffb29b78f7656d15e160 (patch) | |
| tree | 32e9a84e7862b20ea3afe0891936d185b80ac6b6 /src | |
| parent | f5cf1a841965e8e69cf56669430553b2dc225631 (diff) | |
| parent | 732cc736c9450c7f0e7f6413bd04ed6d851b624b (diff) | |
| download | rust-1fac3ca9c4e4ba3d27a9ffb29b78f7656d15e160.tar.gz rust-1fac3ca9c4e4ba3d27a9ffb29b78f7656d15e160.zip | |
Auto merge of #50129 - wesleywiser:clean_up1, r=michaelwoerister
Clean up `IsolatedEncoder::encode_info_for_impl_item()` a bit Suggested in the [comments of #49991](https://github.com/rust-lang/rust/pull/49991/files/4a77d35c1ed89310a0ed128ce931cd4b85ca4cd4#r183048939)
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_metadata/encoder.rs | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index b65e9a715fa..d7a06f7932f 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -925,18 +925,19 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> { }; let mir = - if let hir::ImplItemKind::Const(..) = ast_item.node { - true - } else if let hir::ImplItemKind::Method(ref sig, _) = ast_item.node { - let generics = self.tcx.generics_of(def_id); - let types = generics.parent_types as usize + generics.types.len(); - let needs_inline = (types > 0 || tcx.trans_fn_attrs(def_id).requests_inline()) && - !self.metadata_output_only(); - let is_const_fn = sig.constness == hir::Constness::Const; - let always_encode_mir = self.tcx.sess.opts.debugging_opts.always_encode_mir; - needs_inline || is_const_fn || always_encode_mir - } else { - false + match ast_item.node { + hir::ImplItemKind::Const(..) => true, + hir::ImplItemKind::Method(ref sig, _) => { + let generics = self.tcx.generics_of(def_id); + let types = generics.parent_types as usize + generics.types.len(); + let needs_inline = + (types > 0 || tcx.trans_fn_attrs(def_id).requests_inline()) + && !self.metadata_output_only(); + let is_const_fn = sig.constness == hir::Constness::Const; + let always_encode_mir = self.tcx.sess.opts.debugging_opts.always_encode_mir; + needs_inline || is_const_fn || always_encode_mir + }, + hir::ImplItemKind::Type(..) => false, }; Entry { |
