From db7295fa960a729a4577e0e206f7a3a5a472addb Mon Sep 17 00:00:00 2001
From: Alan Egerton <eggyal@gmail.com>
Date: Sun, 28 Nov 2021 15:07:25 +0000
Subject: [PATCH] Remove no-longer used `IdFunctor::map_id`

---
 compiler/rustc_data_structures/src/functor.rs | 8 --------
 compiler/rustc_data_structures/src/lib.rs     | 1 -
 2 files changed, 9 deletions(-)

diff --git a/compiler/rustc_data_structures/src/functor.rs b/compiler/rustc_data_structures/src/functor.rs
index 920f7b1ed0a..9e1497961d9 100644
--- a/compiler/rustc_data_structures/src/functor.rs
+++ b/compiler/rustc_data_structures/src/functor.rs
@@ -4,14 +4,6 @@ use std::mem;
 pub trait IdFunctor: Sized {
     type Inner;
 
-    #[inline]
-    fn map_id<F>(self, mut f: F) -> Self
-    where
-        F: FnMut(Self::Inner) -> Self::Inner,
-    {
-        self.try_map_id::<_, !>(|value| Ok(f(value))).into_ok()
-    }
-
     fn try_map_id<F, E>(self, f: F) -> Result<Self, E>
     where
         F: FnMut(Self::Inner) -> Result<Self::Inner, E>;
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs
index d4eb622e780..77784bf1705 100644
--- a/compiler/rustc_data_structures/src/lib.rs
+++ b/compiler/rustc_data_structures/src/lib.rs
@@ -25,7 +25,6 @@
 #![feature(once_cell)]
 #![feature(test)]
 #![feature(thread_id_value)]
-#![feature(unwrap_infallible)]
 #![allow(rustc::default_hash_types)]
 #![deny(unaligned_references)]