From 141d2f3f025c649e92e71dc1f22198cb265c435a Mon Sep 17 00:00:00 2001
From: NotLebedev <notlebedev@gmail.com>
Date: Sat, 1 Mar 2025 10:57:17 +0300
Subject: [PATCH] Replace usages of `Context.def_name`

Use `DefId.name` and `DefId.trimmed_name` instead
---
 compiler/stable_mir/src/crate_def.rs | 6 ++----
 compiler/stable_mir/src/lib.rs       | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/compiler/stable_mir/src/crate_def.rs b/compiler/stable_mir/src/crate_def.rs
index 469e8a7cf899..d36426d5a990 100644
--- a/compiler/stable_mir/src/crate_def.rs
+++ b/compiler/stable_mir/src/crate_def.rs
@@ -41,8 +41,7 @@ pub trait CrateDef {
 
     /// Return the fully qualified name of the current definition.
     fn name(&self) -> Symbol {
-        let def_id = self.def_id();
-        with(|cx| cx.def_name(def_id, false))
+        self.def_id().name()
     }
 
     /// Return a trimmed name of this definition.
@@ -56,8 +55,7 @@ pub trait CrateDef {
     /// For example, this function may shorten `std::vec::Vec` to just `Vec`,
     /// as long as there is no other `Vec` importable anywhere.
     fn trimmed_name(&self) -> Symbol {
-        let def_id = self.def_id();
-        with(|cx| cx.def_name(def_id, true))
+        self.def_id().trimmed_name()
     }
 
     /// Return information about the crate where this definition is declared.
diff --git a/compiler/stable_mir/src/lib.rs b/compiler/stable_mir/src/lib.rs
index 0b4cebadad1d..8df36e23c4a2 100644
--- a/compiler/stable_mir/src/lib.rs
+++ b/compiler/stable_mir/src/lib.rs
@@ -48,10 +48,7 @@ pub type CrateNum = usize;
 
 impl Debug for DefId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DefId")
-            .field("id", &self.0)
-            .field("name", &with(|cx| cx.def_name(*self, false)))
-            .finish()
+        f.debug_struct("DefId").field("id", &self.0).field("name", &self.name()).finish()
     }
 }