Rollup merge of #76809 - matthiaskrgr:simplify_cond, r=varkor

RalfJung · web-flow · commit 9b9192a2d5df · 2020-09-20T12:08:17.000+02:00
simplfy condition in ItemLowerer::with_trait_impl_ref()
diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs
@@ -27,7 +27,7 @@ pub(super) struct ItemLowerer<'a, 'lowering, 'hir> {
 impl ItemLowerer<'_, '_, '_> {
     fn with_trait_impl_ref(&mut self, impl_ref: &Option<TraitRef>, f: impl FnOnce(&mut Self)) {
         let old = self.lctx.is_in_trait_impl;
-        self.lctx.is_in_trait_impl = if let &None = impl_ref { false } else { true };
+        self.lctx.is_in_trait_impl = impl_ref.is_some();
         f(self);
         self.lctx.is_in_trait_impl = old;
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pub(super) struct ItemLowerer<'a, 'lowering, 'hir> {`
`27`	`27`	`impl ItemLowerer<'_, '_, '_> {`
`28`	`28`	`fn with_trait_impl_ref(&mut self, impl_ref: &Option<TraitRef>, f: impl FnOnce(&mut Self)) {`
`29`	`29`	`let old = self.lctx.is_in_trait_impl;`
`30`		`- self.lctx.is_in_trait_impl = if let &None = impl_ref { false } else { true };`
	`30`	`+ self.lctx.is_in_trait_impl = impl_ref.is_some();`
`31`	`31`	`f(self);`
`32`	`32`	`self.lctx.is_in_trait_impl = old;`
`33`	`33`	`}`