Revert changes to new_exception_msg and new_exception_msg_dict

ShaharNaveh · ShaharNaveh · commit ebc88bc95e2c · 2025-06-24T17:53:04.000+03:00
diff --git a/vm/src/buffer.rs b/vm/src/buffer.rs
@@ -646,5 +646,5 @@ pub fn struct_error_type(vm: &VirtualMachine) -> &'static PyTypeRef {
 pub fn new_struct_error(vm: &VirtualMachine, msg: impl Into<String>) -> PyBaseExceptionRef {
     // can't just STRUCT_ERROR.get().unwrap() cause this could be called before from buffer
     // machinery, independent of whether _struct was ever imported
-    vm.new_exception_msg(struct_error_type(vm).clone(), msg)
+    vm.new_exception_msg(struct_error_type(vm).clone(), msg.into())
 }
diff --git a/vm/src/vm/vm_new.rs b/vm/src/vm/vm_new.rs
@@ -25,7 +25,7 @@ macro_rules! define_exception_fn {
         pub fn $fn_name(&self, msg: impl Into<String>) -> PyBaseExceptionRef
         {
             let err = self.ctx.exceptions.$attr.to_owned();
-            self.new_exception_msg(err, msg)
+            self.new_exception_msg(err, msg.into())
         }
     };
 }
@@ -117,12 +117,8 @@ impl VirtualMachine {
     /// type is passed in, it may not be fully initialized; try using
     /// [`vm.invoke_exception()`][Self::invoke_exception] or
     /// [`exceptions::ExceptionCtor`][crate::exceptions::ExceptionCtor] instead.
-    pub fn new_exception_msg(
-        &self,
-        exc_type: PyTypeRef,
-        msg: impl Into<String>,
-    ) -> PyBaseExceptionRef {
-        self.new_exception(exc_type, vec![self.ctx.new_str(msg.into()).into()])
+    pub fn new_exception_msg(&self, exc_type: PyTypeRef, msg: String) -> PyBaseExceptionRef {
+        self.new_exception(exc_type, vec![self.ctx.new_str(msg).into()])
     }
 
     /// Instantiate an exception with `msg` as the only argument and `dict` for object
@@ -133,14 +129,14 @@ impl VirtualMachine {
     pub fn new_exception_msg_dict(
         &self,
         exc_type: PyTypeRef,
-        msg: impl Into<String>,
+        msg: String,
         dict: PyDictRef,
     ) -> PyBaseExceptionRef {
         PyRef::new_ref(
             // TODO: this constructor might be invalid, because multiple
             // exception (even builtin ones) are using custom constructors,
             // see `OSError` as an example:
-            PyBaseException::new(vec![self.ctx.new_str(msg.into()).into()], self),
+            PyBaseException::new(vec![self.ctx.new_str(msg).into()], self),
             exc_type,
             Some(dict),
         )
@@ -162,7 +158,7 @@ impl VirtualMachine {
 
     pub fn new_name_error(&self, msg: impl Into<String>, name: PyStrRef) -> PyBaseExceptionRef {
         let name_error_type = self.ctx.exceptions.name_error.to_owned();
-        let name_error = self.new_exception_msg(name_error_type, msg);
+        let name_error = self.new_exception_msg(name_error_type, msg.into());
         name_error.as_object().set_attr("name", name, self).unwrap();
         name_error
     }
@@ -476,7 +472,7 @@ impl VirtualMachine {
 
     pub fn new_import_error(&self, msg: impl Into<String>, name: PyStrRef) -> PyBaseExceptionRef {
         let import_error = self.ctx.exceptions.import_error.to_owned();
-        let exc = self.new_exception_msg(import_error, msg);
+        let exc = self.new_exception_msg(import_error, msg.into());
         exc.as_object().set_attr("name", name, self).unwrap();
         exc
     }

Original file line number	Diff line number	Diff line change
`@@ -646,5 +646,5 @@ pub fn struct_error_type(vm: &VirtualMachine) -> &'static PyTypeRef {`
`646`	`646`	`pub fn new_struct_error(vm: &VirtualMachine, msg: impl Into<String>) -> PyBaseExceptionRef {`
`647`	`647`	`// can't just STRUCT_ERROR.get().unwrap() cause this could be called before from buffer`
`648`	`648`	`// machinery, independent of whether _struct was ever imported`
`649`		`- vm.new_exception_msg(struct_error_type(vm).clone(), msg)`
	`649`	`+ vm.new_exception_msg(struct_error_type(vm).clone(), msg.into())`
`650`	`650`	`}`