Skip to content

Commit ee9a472

Browse files
authored
Fix bad merge in rust-lang#49991
When I rebased rust-lang#49991 on `master`, I messed up the merge for this line. I'm reverting this back to the way it was in f15e5c1.
1 parent 85f5dd4 commit ee9a472

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/librustc_metadata/encoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
930930
} else if let hir::ImplItemKind::Method(ref sig, _) = ast_item.node {
931931
let generics = self.tcx.generics_of(def_id);
932932
let types = generics.parent_types as usize + generics.types.len();
933-
let needs_inline = types > 0 || tcx.trans_fn_attrs(def_id).requests_inline() &&
933+
let needs_inline = (types > 0 || tcx.trans_fn_attrs(def_id).requests_inline()) &&
934934
!self.metadata_output_only();
935935
let is_const_fn = sig.constness == hir::Constness::Const;
936936
let always_encode_mir = self.tcx.sess.opts.debugging_opts.always_encode_mir;

0 commit comments

Comments
 (0)