From 076fa6342483aad940219b8533cbace444e262ca Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 29 Jan 2021 14:45:03 +0100
Subject: [PATCH] Improve code

---
 src/librustdoc/clean/types.rs       | 4 ++--
 src/librustdoc/html/render/cache.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index ca8ee8ac82d2..510eaa054063 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -1320,10 +1320,10 @@ impl From<hir::def::DefKind> for TypeKind {
             hir::def::DefKind::Union => Self::Union,
             hir::def::DefKind::Trait => Self::Trait,
             hir::def::DefKind::TyAlias => Self::Typedef,
-            hir::def::DefKind::ForeignTy => Self::Foreign,
             hir::def::DefKind::TraitAlias => Self::TraitAlias,
             hir::def::DefKind::Macro(_) => Self::Macro,
-            hir::def::DefKind::Variant
+            hir::def::DefKind::ForeignTy
+            | hir::def::DefKind::Variant
             | hir::def::DefKind::AssocTy
             | hir::def::DefKind::TyParam
             | hir::def::DefKind::ConstParam
diff --git a/src/librustdoc/html/render/cache.rs b/src/librustdoc/html/render/cache.rs
index 821f1cc71a3d..97694150c6c7 100644
--- a/src/librustdoc/html/render/cache.rs
+++ b/src/librustdoc/html/render/cache.rs
@@ -304,7 +304,7 @@ crate fn get_real_types<'tcx>(
             }
         }
         if let Some(bound) = generics.params.iter().find(|g| g.is_type() && g.name == arg_s) {
-            for bound in bound.get_bounds().unwrap_or_else(|| &[]) {
+            for bound in bound.get_bounds().unwrap_or(&[]) {
                 if let Some(ty) = bound.get_trait_type() {
                     let adds = get_real_types(generics, &ty, tcx, recurse + 1, cache, res);
                     nb_added += adds;