From d8ad4afce8c48c05563b22ea7017597c1938159f Mon Sep 17 00:00:00 2001
From: Johann Hemmann <johann.hemmann@code.berlin>
Date: Fri, 19 Jan 2024 14:06:12 +0100
Subject: [PATCH] manual_map

---
 Cargo.toml                         | 1 -
 crates/hir-def/src/hir/type_ref.rs | 6 +-----
 crates/hir/src/lib.rs              | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 847ad081312..75948a9be60 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -182,7 +182,6 @@ get_first = "allow"
 if_same_then_else = "allow"
 large_enum_variant = "allow"
 let_and_return = "allow"
-manual_map = "allow"
 map_clone = "allow"
 match_like_matches_macro = "allow"
 match_single_binding = "allow"
diff --git a/crates/hir-def/src/hir/type_ref.rs b/crates/hir-def/src/hir/type_ref.rs
index 17ff736aae4..8db00f9d76e 100644
--- a/crates/hir-def/src/hir/type_ref.rs
+++ b/crates/hir-def/src/hir/type_ref.rs
@@ -410,11 +410,7 @@ impl ConstRef {
         lower_ctx: &LowerCtx<'_>,
         param: &ast::ConstParam,
     ) -> Option<Self> {
-        let default = param.default_val();
-        match default {
-            Some(_) => Some(Self::from_const_arg(lower_ctx, default)),
-            None => None,
-        }
+        param.default_val().map(|default| Self::from_const_arg(lower_ctx, Some(default)))
     }
 
     pub fn display<'a>(&'a self, db: &'a dyn ExpandDatabase) -> impl fmt::Display + 'a {
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 8e0b0ff6adf..501f262249c 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -4285,10 +4285,8 @@ impl Type {
                 // arg can be either a `Ty` or `constant`
                 if let Some(ty) = arg.ty(Interner) {
                     Some(format_smolstr!("{}", ty.display(db)))
-                } else if let Some(const_) = arg.constant(Interner) {
-                    Some(format_smolstr!("{}", const_.display(db)))
                 } else {
-                    None
+                    arg.constant(Interner).map(|const_| format_smolstr!("{}", const_.display(db)))
                 }
             })
     }