From a8b57723d41d5f8b58bc4796ecb4bde0ed00e639 Mon Sep 17 00:00:00 2001
From: Fabian Wolff <fabian.wolff@alumni.ethz.ch>
Date: Sat, 26 Jun 2021 22:26:26 +0200
Subject: [PATCH] Use `Option::map()` instead of `if let`
---
compiler/rustc_driver/src/pretty.rs | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/compiler/rustc_driver/src/pretty.rs b/compiler/rustc_driver/src/pretty.rs
index 2a11d62ac15..bf131914b97 100644
--- a/compiler/rustc_driver/src/pretty.rs
+++ b/compiler/rustc_driver/src/pretty.rs
@@ -324,16 +324,12 @@ impl<'tcx> pprust_hir::PpAnn for TypedAnnotation<'tcx> {
}
fn post(&self, s: &mut pprust_hir::State<'_>, node: pprust_hir::AnnNode<'_>) {
if let pprust_hir::AnnNode::Expr(expr) = node {
- let typeck_results =
- self.maybe_typeck_results.get().or_else(|| {
- if let Some(body_id) = self.tcx.hir().maybe_body_owned_by(
- self.tcx.hir().local_def_id_to_hir_id(expr.hir_id.owner),
- ) {
- Some(self.tcx.typeck_body(body_id))
- } else {
- None
- }
- });
+ let typeck_results = self.maybe_typeck_results.get().or_else(|| {
+ self.tcx
+ .hir()
+ .maybe_body_owned_by(self.tcx.hir().local_def_id_to_hir_id(expr.hir_id.owner))
+ .map(|body_id| self.tcx.typeck_body(body_id))
+ });
if let Some(typeck_results) = typeck_results {
s.s.space();