From ccc8f7ed37cf763ee0558f3a27c9be5c020bb0d3 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Sun, 19 Mar 2023 10:31:32 +0900
Subject: [PATCH] clean up name() usage

---
 vm/src/builtins/str.rs |  5 +----
 vm/src/cformat.rs      |  4 ++--
 vm/src/object/core.rs  | 15 +++++++--------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/vm/src/builtins/str.rs b/vm/src/builtins/str.rs
index 32b86f0e6..ed3efbb5e 100644
--- a/vm/src/builtins/str.rs
+++ b/vm/src/builtins/str.rs
@@ -1653,10 +1653,7 @@ mod tests {
             let translated = text.translate(translated, vm).unwrap();
             assert_eq!(translated, "🎅xda".to_owned());
             let translated = text.translate(vm.ctx.new_int(3).into(), vm);
-            assert_eq!(
-                translated.unwrap_err().class().name().deref(),
-                "TypeError".to_owned()
-            );
+            assert_eq!("TypeError", &*translated.unwrap_err().class().name(),);
         })
     }
 }
diff --git a/vm/src/cformat.rs b/vm/src/cformat.rs
index 4deb874d8..a0e4c8c2f 100644
--- a/vm/src/cformat.rs
+++ b/vm/src/cformat.rs
@@ -84,12 +84,12 @@ fn spec_format_bytes(
             }
         },
         CFormatType::Float(_) => {
-            let type_name = obj.class().name().to_string();
+            let class = obj.class().to_owned();
             let value = ArgIntoFloat::try_from_object(vm, obj).map_err(|e| {
                 if e.fast_isinstance(vm.ctx.exceptions.type_error) {
                     // formatfloat in bytesobject.c generates its own specific exception
                     // text in this case, mirror it here.
-                    vm.new_type_error(format!("float argument required, not {type_name}"))
+                    vm.new_type_error(format!("float argument required, not {}", class.name()))
                 } else {
                     e
                 }
diff --git a/vm/src/object/core.rs b/vm/src/object/core.rs
index 1de24bdec..f7cce8851 100644
--- a/vm/src/object/core.rs
+++ b/vm/src/object/core.rs
@@ -611,14 +611,13 @@ impl PyObject {
             None
         };
         let cls_is_weakref = typ.is(vm.ctx.types.weakref_type);
-        self.weak_ref_list()
-            .map(|wrl| wrl.add(self, typ, cls_is_weakref, callback, dict))
-            .ok_or_else(|| {
-                vm.new_type_error(format!(
-                    "cannot create weak reference to '{}' object",
-                    self.class().name()
-                ))
-            })
+        let wrl = self.weak_ref_list().ok_or_else(|| {
+            vm.new_type_error(format!(
+                "cannot create weak reference to '{}' object",
+                self.class().name()
+            ))
+        })?;
+        Ok(wrl.add(self, typ, cls_is_weakref, callback, dict))
     }
 
     pub fn downgrade(