Merge pull request RustPython#3133 from youknowone/exception-utils-as-vm-methods

Exception utils as vm methods

Author: youknowone

examples/freeze/main.rs

@@ -13,8 +13,8 @@ fn run(vm: &vm::VirtualMachine) -> vm::PyResult<()> {
 
     let res = vm.run_code_obj(vm.new_code_object(module), scope);
 
-    if let Err(err) = res {
-        vm::exceptions::print_exception(&vm, err);
+    if let Err(exc) = res {
+        vm.print_exception(exc);
     }
 
     Ok(())

examples/mini_repl.rs

@@ -76,8 +76,8 @@ def fib(n):
                     scope.globals.set_item("last", output, vm)?;
                 }
             }
-            Err(e) => {
-                vm::exceptions::print_exception(vm, e);
+            Err(exc) => {
+                vm.print_exception(exc);
             }
         }
     }

src/lib.rs

@@ -45,9 +45,9 @@ extern crate log;
 
 use clap::{App, AppSettings, Arg, ArgMatches};
 use rustpython_vm::{
-    builtins::PyDictRef, builtins::PyInt, compile, exceptions::print_exception, match_class,
-    scope::Scope, stdlib::sys, InitParameter, Interpreter, ItemProtocol, PyObjectRef, PyResult,
-    PySettings, TryFromObject, TypeProtocol, VirtualMachine,
+    builtins::PyDictRef, builtins::PyInt, compile, match_class, scope::Scope, stdlib::sys,
+    InitParameter, Interpreter, ItemProtocol, PyObjectRef, PyResult, PySettings, TryFromObject,
+    TypeProtocol, VirtualMachine,
 };
 
 use std::convert::TryInto;
@@ -136,8 +136,8 @@ where
                     }
                 }
             }
-            Err(err) => {
-                print_exception(vm, err);
+            Err(exc) => {
+                vm.print_exception(exc);
                 1
             }
         };

src/shell.rs

@@ -5,7 +5,6 @@ use rustpython_vm::readline::{Readline, ReadlineResult};
 use rustpython_vm::{
     builtins::PyBaseExceptionRef,
     compile::{self, CompileError, CompileErrorType},
-    exceptions::print_exception,
     scope::Scope,
     PyResult, TypeProtocol, VirtualMachine,
 };
@@ -130,7 +129,7 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
                 repl.save_history(&repl_history_path).unwrap();
                 return Err(exc);
             }
-            print_exception(vm, exc);
+            vm.print_exception(exc);
         }
     }
     repl.save_history(&repl_history_path).unwrap();

vm/src/coroutine.rs

@@ -1,7 +1,6 @@
 use crate::{
     builtins::{PyBaseExceptionRef, PyStrRef},
     common::lock::PyMutex,
-    exceptions,
     frame::{ExecutionResult, FrameRef},
     protocol::PyIterReturn,
     IdProtocol, PyObjectRef, PyResult, TypeProtocol, VirtualMachine,
@@ -140,7 +139,7 @@ impl Coro {
         vm: &VirtualMachine,
     ) -> PyResult<PyIterReturn> {
         if self.closed.load() {
-            return Err(exceptions::normalize(exc_type, exc_val, exc_tb, vm)?);
+            return Err(vm.normalize_exception(exc_type, exc_val, exc_tb)?);
         }
         let result = self.run_with_context(gen, vm, |f| f.gen_throw(vm, exc_type, exc_val, exc_tb));
         self.maybe_close(&result);