Skip to content

Commit 90e6f70

Browse files
committed
Expose exception types under vm::builtins
1 parent 34e951d commit 90e6f70

28 files changed

+599
-575
lines changed

derive/src/pyclass.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ pub(crate) fn impl_define_exception(
346346

347347
#[pymethod(magic)]
348348
pub(crate) fn init(
349-
zelf: ::rustpython_vm::PyRef<::rustpython_vm::exceptions::PyBaseException>,
349+
zelf: ::rustpython_vm::PyRef<::rustpython_vm::builtins::PyBaseException>,
350350
args: ::rustpython_vm::function::FuncArgs,
351351
vm: &::rustpython_vm::VirtualMachine,
352352
) -> ::rustpython_vm::PyResult<()> {

src/shell.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ mod helper;
33
use rustpython_parser::error::{LexicalErrorType, ParseErrorType};
44
use rustpython_vm::readline::{Readline, ReadlineResult};
55
use rustpython_vm::{
6+
builtins::PyBaseExceptionRef,
67
compile::{self, CompileError, CompileErrorType},
7-
exceptions::{print_exception, PyBaseExceptionRef},
8+
exceptions::print_exception,
89
scope::Scope,
910
PyResult, TypeProtocol, VirtualMachine,
1011
};

vm/src/builtins/asyncgenerator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::{PyCode, PyStrRef, PyTypeRef};
22
use crate::{
3+
builtins::PyBaseExceptionRef,
34
coroutine::{Coro, Variant},
4-
exceptions::PyBaseExceptionRef,
55
frame::FrameRef,
66
function::OptionalArg,
77
slots::{IteratorIterable, PyIter},

vm/src/builtins/dict.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::{IterStatus, PySet, PyStrRef, PyTypeRef};
22
use crate::{
3+
builtins::PyBaseExceptionRef,
34
dictdatatype::{self, DictKey},
4-
exceptions::PyBaseExceptionRef,
55
function::{ArgIterable, FuncArgs, KwArgs, OptionalArg},
66
iterator,
77
slots::{Comparable, Hashable, Iterable, IteratorIterable, PyComparisonOp, PyIter, Unhashable},

vm/src/builtins/function/jitfunc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::builtins::dict::PyDictRef;
22
use crate::builtins::function::{PyFunction, PyFunctionRef};
3+
use crate::builtins::PyBaseExceptionRef;
34
use crate::builtins::{float, int, pybool, PyStrRef};
45
use crate::bytecode::CodeFlags;
5-
use crate::exceptions::PyBaseExceptionRef;
66
use crate::function::FuncArgs;
77
use crate::VirtualMachine;
88
use crate::{

vm/src/builtins/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,5 @@ pub use int::try_to_float as try_bigint_to_f64;
8686

8787
mod make_module;
8888
pub use make_module::{ascii, make_module, print};
89+
90+
pub use crate::exceptions::types::*;

vm/src/codecs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::borrow::Cow;
22
use std::collections::HashMap;
33
use std::ops::Range;
44

5+
use crate::builtins::PyBaseExceptionRef;
56
use crate::builtins::{PyBytesRef, PyStr, PyStrRef, PyTuple, PyTupleRef};
67
use crate::common::lock::PyRwLock;
7-
use crate::exceptions::PyBaseExceptionRef;
88
use crate::VirtualMachine;
99
use crate::{IntoPyObject, PyContext, PyObjectRef, PyResult, PyValue, TryFromObject, TypeProtocol};
1010

vm/src/coroutine.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use crate::builtins::PyBaseExceptionRef;
12
use crate::builtins::{PyStrRef, PyTypeRef};
2-
use crate::exceptions::{self, PyBaseExceptionRef};
3+
use crate::exceptions;
34
use crate::frame::{ExecutionResult, FrameRef};
45
use crate::VirtualMachine;
56
use crate::{PyObjectRef, PyResult, TypeProtocol};

0 commit comments

Comments
 (0)