End of IntoPyStrRef

Author: youknowone

vm/src/builtins/str.rs

@@ -143,52 +143,6 @@ impl fmt::Display for PyStr {
     }
 }
 
-pub trait IntoPyStrRef {
-    fn into_pystr_ref(self, vm: &VirtualMachine) -> PyStrRef;
-}
-
-impl IntoPyStrRef for PyStrRef {
-    #[inline]
-    fn into_pystr_ref(self, _vm: &VirtualMachine) -> PyRef<PyStr> {
-        self
-    }
-}
-
-impl IntoPyStrRef for PyStr {
-    #[inline]
-    fn into_pystr_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
-        self.into_ref(vm)
-    }
-}
-
-impl IntoPyStrRef for AsciiString {
-    #[inline]
-    fn into_pystr_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
-        PyStr::from(self).into_ref(vm)
-    }
-}
-
-impl IntoPyStrRef for String {
-    #[inline]
-    fn into_pystr_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
-        PyStr::from(self).into_ref(vm)
-    }
-}
-
-impl IntoPyStrRef for &str {
-    #[inline]
-    fn into_pystr_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
-        PyStr::from(self).into_ref(vm)
-    }
-}
-
-impl IntoPyStrRef for &'static PyStrInterned {
-    #[inline]
-    fn into_pystr_ref(self, _vm: &VirtualMachine) -> PyRef<PyStr> {
-        self.to_owned()
-    }
-}
-
 pub trait AsPyStr<'a>
 where
     Self: 'a,
@@ -655,7 +609,7 @@ impl PyStr {
         if s == stripped {
             zelf
         } else {
-            stripped.into_pystr_ref(vm)
+            vm.ctx.new_str(stripped)
         }
     }
 
@@ -674,7 +628,7 @@ impl PyStr {
         if s == stripped {
             zelf
         } else {
-            stripped.into_pystr_ref(vm)
+            vm.ctx.new_str(stripped)
         }
     }
 
@@ -985,7 +939,7 @@ impl PyStr {
             }
             Err(iter) => zelf.as_str().py_join(iter)?,
         };
-        Ok(joined.into_pystr_ref(vm))
+        Ok(vm.ctx.new_str(joined))
     }
 
     // FIXME: two traversals of str is expensive

vm/src/frame.rs

@@ -1144,7 +1144,7 @@ impl ExecutingFrame<'_> {
     fn import_from(&mut self, vm: &VirtualMachine, idx: bytecode::NameIdx) -> PyResult {
         let module = self.last_value();
         let name = self.code.names[idx as usize];
-        let err = || vm.new_import_error(format!("cannot import name '{name}'"), name);
+        let err = || vm.new_import_error(format!("cannot import name '{name}'"), name.to_owned());
         // Load attribute, and transform any error into import error.
         if let Some(obj) = vm.get_attribute_opt(module.clone(), name)? {
             return Ok(obj);

vm/src/import.rs

@@ -73,10 +73,12 @@ pub(crate) fn init_importlib_package(
 }
 
 pub fn make_frozen(vm: &VirtualMachine, name: &str) -> PyResult<PyRef<PyCode>> {
-    let frozen =
-        vm.state.frozen.get(name).ok_or_else(|| {
-            vm.new_import_error(format!("No such frozen object named {name}"), name)
-        })?;
+    let frozen = vm.state.frozen.get(name).ok_or_else(|| {
+        vm.new_import_error(
+            format!("No such frozen object named {name}"),
+            vm.ctx.new_str(name),
+        )
+    })?;
     Ok(vm.ctx.new_code(frozen.code))
 }
 
@@ -92,7 +94,7 @@ pub fn import_builtin(vm: &VirtualMachine, module_name: &str) -> PyResult {
     let make_module_func = vm.state.module_inits.get(module_name).ok_or_else(|| {
         vm.new_import_error(
             format!("Cannot import builtin module {module_name}"),
-            module_name,
+            vm.ctx.new_str(module_name),
         )
     })?;
     let module = make_module_func(vm);

vm/src/scope.rs

@@ -141,7 +141,7 @@ impl Scope {
 //     impl Sealed for super::PyStrRef {}
 // }
 // pub trait PyName:
-//     sealed::Sealed + crate::dictdatatype::DictKey + Clone + ToPyObject + IntoPyStrRef
+//     sealed::Sealed + crate::dictdatatype::DictKey + Clone + ToPyObject
 // {
 // }
 // impl PyName for str {}

vm/src/stdlib/imp.rs

@@ -69,7 +69,7 @@ impl FrozenError {
             Excluded => format!("Excluded frozen object named {mod_name}"),
             Invalid => format!("Frozen object named {mod_name} is invalid"),
         };
-        vm.new_import_error(msg, mod_name)
+        vm.new_import_error(msg, vm.ctx.new_str(mod_name))
     }
 }
 

vm/src/stdlib/sys.rs

@@ -367,7 +367,7 @@ mod sys {
             _ => return print_unimportable_module_warn(),
         };
 
-        let (module_path, attr_name) = if last.eq(&env_var) {
+        let (module_path, attr_name) = if last == env_var {
             ("builtins", env_var.as_str())
         } else {
             (&env_var[..(env_var.len() - last.len() - 1)], last)

vm/src/vm/vm_new.rs

@@ -1,6 +1,5 @@
 use crate::{
     builtins::{
-        pystr::IntoPyStrRef,
         tuple::{IntoPyTuple, PyTupleRef},
         PyBaseException, PyBaseExceptionRef, PyDictRef, PyModule, PyStrRef, PyType, PyTypeRef,
     },
@@ -268,12 +267,10 @@ impl VirtualMachine {
         syntax_error
     }
 
-    pub fn new_import_error(&self, msg: String, name: impl IntoPyStrRef) -> PyBaseExceptionRef {
+    pub fn new_import_error(&self, msg: String, name: PyStrRef) -> PyBaseExceptionRef {
         let import_error = self.ctx.exceptions.import_error.to_owned();
         let exc = self.new_exception_msg(import_error, msg);
-        exc.as_object()
-            .set_attr("name", name.into_pystr_ref(self), self)
-            .unwrap();
+        exc.as_object().set_attr("name", name, self).unwrap();
         exc
     }