remove meaningless relocation

youknowone · youknowone · commit aa3bedacce07 · 2021-10-08T02:20:58.000+09:00
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -949,9 +949,6 @@ impl<C: widestring::UChar> IntoPyException for widestring::NulError<C> {
 
 pub(super) mod types {
     use crate::common::lock::PyRwLock;
-
-    #[cfg(not(target_arch = "wasm32"))]
-    use crate::stdlib::errno::errors;
     use crate::{
         builtins::{traceback::PyTracebackRef, PyInt, PyTupleRef, PyTypeRef},
         exceptions::invoke,
@@ -1076,6 +1073,29 @@ pub(super) mod types {
         import_error_init,
     }
 
+    fn base_exception_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
+        PyBaseException::slot_new(cls, args, vm)
+    }
+
+    fn import_error_init(
+        zelf: PyRef<PyBaseException>,
+        args: FuncArgs,
+        vm: &VirtualMachine,
+    ) -> PyResult<()> {
+        let exc_self = zelf.into_object();
+        vm.set_attr(
+            &exc_self,
+            "name",
+            vm.unwrap_or_none(args.kwargs.get("name").cloned()),
+        )?;
+        vm.set_attr(
+            &exc_self,
+            "path",
+            vm.unwrap_or_none(args.kwargs.get("path").cloned()),
+        )?;
+        Ok(())
+    }
+
     define_exception! {
         PyModuleNotFoundError,
         PyImportError,
@@ -1393,6 +1413,8 @@ pub(super) mod types {
         args: Vec<PyObjectRef>,
         vm: &VirtualMachine,
     ) -> Option<PyResult<PyBaseExceptionRef>> {
+        use crate::stdlib::errno::errors;
+
         let len = args.len();
         if len >= 2 {
             let args = args.as_slice();
@@ -1440,10 +1462,6 @@ pub(super) mod types {
         }
     }
 
-    fn base_exception_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PyBaseException::slot_new(cls, args, vm)
-    }
-
     #[cfg(not(target_arch = "wasm32"))]
     fn os_error_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
         // We need this method, because of how `CPython` copies `init`
@@ -1471,23 +1489,4 @@ pub(super) mod types {
     ) -> PyResult<()> {
         PyBaseException::init(zelf, args, vm)
     }
-
-    fn import_error_init(
-        zelf: PyRef<PyBaseException>,
-        args: FuncArgs,
-        vm: &VirtualMachine,
-    ) -> PyResult<()> {
-        let exc_self = zelf.into_object();
-        vm.set_attr(
-            &exc_self,
-            "name",
-            vm.unwrap_or_none(args.kwargs.get("name").cloned()),
-        )?;
-        vm.set_attr(
-            &exc_self,
-            "path",
-            vm.unwrap_or_none(args.kwargs.get("path").cloned()),
-        )?;
-        Ok(())
-    }
 }
