Skip to content

Commit ccc8f7e

Browse files
committed
clean up name() usage
1 parent 8d38bf8 commit ccc8f7e

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

vm/src/builtins/str.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,10 +1653,7 @@ mod tests {
16531653
let translated = text.translate(translated, vm).unwrap();
16541654
assert_eq!(translated, "🎅xda".to_owned());
16551655
let translated = text.translate(vm.ctx.new_int(3).into(), vm);
1656-
assert_eq!(
1657-
translated.unwrap_err().class().name().deref(),
1658-
"TypeError".to_owned()
1659-
);
1656+
assert_eq!("TypeError", &*translated.unwrap_err().class().name(),);
16601657
})
16611658
}
16621659
}

vm/src/cformat.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ fn spec_format_bytes(
8484
}
8585
},
8686
CFormatType::Float(_) => {
87-
let type_name = obj.class().name().to_string();
87+
let class = obj.class().to_owned();
8888
let value = ArgIntoFloat::try_from_object(vm, obj).map_err(|e| {
8989
if e.fast_isinstance(vm.ctx.exceptions.type_error) {
9090
// formatfloat in bytesobject.c generates its own specific exception
9191
// text in this case, mirror it here.
92-
vm.new_type_error(format!("float argument required, not {type_name}"))
92+
vm.new_type_error(format!("float argument required, not {}", class.name()))
9393
} else {
9494
e
9595
}

vm/src/object/core.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -611,14 +611,13 @@ impl PyObject {
611611
None
612612
};
613613
let cls_is_weakref = typ.is(vm.ctx.types.weakref_type);
614-
self.weak_ref_list()
615-
.map(|wrl| wrl.add(self, typ, cls_is_weakref, callback, dict))
616-
.ok_or_else(|| {
617-
vm.new_type_error(format!(
618-
"cannot create weak reference to '{}' object",
619-
self.class().name()
620-
))
621-
})
614+
let wrl = self.weak_ref_list().ok_or_else(|| {
615+
vm.new_type_error(format!(
616+
"cannot create weak reference to '{}' object",
617+
self.class().name()
618+
))
619+
})?;
620+
Ok(wrl.add(self, typ, cls_is_weakref, callback, dict))
622621
}
623622

624623
pub fn downgrade(

0 commit comments

Comments
 (0)