wip: resolve conflicts after rebase

blue-pandaa · blue-pandaa · commit ffece0929325 · 2023-03-24T00:02:57.000+09:00
diff --git a/vm/src/builtins/builtin_func.rs b/vm/src/builtins/builtin_func.rs
@@ -1,5 +1,4 @@
 use super::{type_, PyClassMethod, PyStaticMethod, PyStr, PyStrRef, PyType};
-use crate::builtins::pystr::IntoPyStrRef;
 use crate::{
     class::PyClassImpl,
     function::{FuncArgs, IntoPyNativeFunc, PyNativeFunc},
@@ -157,7 +156,7 @@ impl PyBuiltinFunction {
             } else {
                 zelf.class().name().to_string()
             };
-            format!("{}.{}", prefix, &self.value.name).into_pystr_ref(vm)
+            PyStr::from(format!("{}.{}", prefix, &self.value.name)).into_ref(&vm.ctx)
         } else {
             self.name()
         }
