Use exported ruff types in vm/**

RustPython · youknowone · Jul 23, 2025 · Jul 22, 2025 · Jul 22, 2025 · Jul 22, 2025
commit 4c78ceaddbffe7ae193851bff65160fd37d03645
diff --git a/vm/src/builtins/code.rs b/vm/src/builtins/code.rs
@@ -15,7 +15,7 @@ use crate::{
 };
 use malachite_bigint::BigInt;
 use num_traits::Zero;
-use ruff_source_file::OneIndexed;
+use rustpython_compiler_core::OneIndexed;
 use std::{borrow::Borrow, fmt, ops::Deref};
 
 #[derive(FromArgs)]

diff --git a/vm/src/builtins/traceback.rs b/vm/src/builtins/traceback.rs
@@ -3,8 +3,8 @@ use crate::{
     Context, Py, PyPayload, PyRef, PyResult, VirtualMachine, class::PyClassImpl, frame::FrameRef,
     types::Constructor,
 };
-use ruff_source_file::OneIndexed;
 use rustpython_common::lock::PyMutex;
+use rustpython_compiler_core::OneIndexed;
 
 #[pyclass(module = false, name = "traceback", traverse)]
 #[derive(Debug)]

diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -21,8 +21,8 @@ use crate::{
 };
 use indexmap::IndexMap;
 use itertools::Itertools;
-use ruff_source_file::SourceLocation;
 use rustpython_common::wtf8::Wtf8Buf;
+use rustpython_compiler_core::SourceLocation;
 #[cfg(feature = "threading")]
 use std::sync::atomic;
 use std::{fmt, iter::zip};

diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -51,8 +51,10 @@ pub mod compiler;
 pub mod convert;
 mod coroutine;
 mod dict_inner;
+
 #[cfg(feature = "rustpython-compiler")]
 pub mod eval;
+
 pub mod exceptions;
 pub mod format;
 pub mod frame;
@@ -61,13 +63,17 @@ pub mod import;
 mod intern;
 pub mod iter;
 pub mod object;
+
 #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
 pub mod ospath;
+
 pub mod prelude;
 pub mod protocol;
 pub mod py_io;
+
 #[cfg(feature = "serde")]
 pub mod py_serde;
+
 pub mod readline;
 pub mod recursion;
 pub mod scope;
@@ -81,6 +87,7 @@ pub mod utils;
 pub mod version;
 pub mod vm;
 pub mod warn;
+
 #[cfg(windows)]
 pub mod windows;
 

diff --git a/vm/src/stdlib/ast.rs b/vm/src/stdlib/ast.rs
@@ -21,8 +21,10 @@ use crate::{
 };
 use node::Node;
 use ruff_python_ast as ruff;
-use ruff_source_file::{LineIndex, OneIndexed, SourceFile, SourceFileBuilder, SourceLocation};
 use ruff_text_size::{Ranged, TextRange, TextSize};
+use rustpython_compiler_core::{
+    LineIndex, OneIndexed, SourceFile, SourceFileBuilder, SourceLocation,
+};
 
 #[cfg(feature = "parser")]
 use ruff_python_parser as parser;

diff --git a/vm/src/stdlib/ast/argument.rs b/vm/src/stdlib/ast/argument.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 pub(super) struct PositionalArguments {
     pub range: TextRange,

diff --git a/vm/src/stdlib/ast/basic.rs b/vm/src/stdlib/ast/basic.rs
@@ -1,7 +1,6 @@
-use ruff_source_file::SourceFile;
-use rustpython_codegen::compile::ruff_int_to_bigint;
-
 use super::*;
+use rustpython_codegen::compile::ruff_int_to_bigint;
+use rustpython_compiler_core::SourceFile;
 
 impl Node for ruff::Identifier {
     fn ast_to_object(self, vm: &VirtualMachine, _source_file: &SourceFile) -> PyObjectRef {

diff --git a/vm/src/stdlib/ast/constant.rs b/vm/src/stdlib/ast/constant.rs
@@ -1,7 +1,7 @@
 use super::*;
 use crate::builtins::{PyComplex, PyFrozenSet, PyTuple};
 use ruff::str_prefix::StringLiteralPrefix;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 #[derive(Debug)]
 pub(super) struct Constant {

diff --git a/vm/src/stdlib/ast/elif_else_clause.rs b/vm/src/stdlib/ast/elif_else_clause.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 pub(super) fn ast_to_object(
     clause: ruff::ElifElseClause,

diff --git a/vm/src/stdlib/ast/exception.rs b/vm/src/stdlib/ast/exception.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 // sum
 impl Node for ruff::ExceptHandler {

diff --git a/vm/src/stdlib/ast/expression.rs b/vm/src/stdlib/ast/expression.rs
@@ -4,7 +4,7 @@ use crate::stdlib::ast::{
     constant::Constant,
     string::JoinedStr,
 };
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 // sum
 impl Node for ruff::Expr {

diff --git a/vm/src/stdlib/ast/module.rs b/vm/src/stdlib/ast/module.rs
@@ -1,6 +1,6 @@
 use super::*;
 use crate::stdlib::ast::type_ignore::TypeIgnore;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 /// Represents the different types of Python module structures.
 ///

diff --git a/vm/src/stdlib/ast/node.rs b/vm/src/stdlib/ast/node.rs
@@ -1,5 +1,5 @@
 use crate::{PyObjectRef, PyResult, VirtualMachine};
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 pub(crate) trait Node: Sized {
     fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef;

diff --git a/vm/src/stdlib/ast/operator.rs b/vm/src/stdlib/ast/operator.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 // sum
 impl Node for ruff::BoolOp {

diff --git a/vm/src/stdlib/ast/other.rs b/vm/src/stdlib/ast/other.rs
@@ -1,7 +1,6 @@
 use super::*;
 use num_traits::ToPrimitive;
-use ruff_source_file::SourceFile;
-use rustpython_compiler_core::bytecode;
+use rustpython_compiler_core::{SourceFile, bytecode};
 
 impl Node for ruff::ConversionFlag {
     fn ast_to_object(self, vm: &VirtualMachine, _source_file: &SourceFile) -> PyObjectRef {

diff --git a/vm/src/stdlib/ast/parameter.rs b/vm/src/stdlib/ast/parameter.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 // product
 impl Node for ruff::Parameters {

diff --git a/vm/src/stdlib/ast/pattern.rs b/vm/src/stdlib/ast/pattern.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 // product
 impl Node for ruff::MatchCase {

diff --git a/vm/src/stdlib/ast/statement.rs b/vm/src/stdlib/ast/statement.rs
@@ -1,6 +1,6 @@
 use super::*;
 use crate::stdlib::ast::argument::{merge_class_def_args, split_class_def_args};
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 // sum
 impl Node for ruff::Stmt {

diff --git a/vm/src/stdlib/ast/type_ignore.rs b/vm/src/stdlib/ast/type_ignore.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 pub(super) enum TypeIgnore {
     TypeIgnore(TypeIgnoreTypeIgnore),

diff --git a/vm/src/stdlib/ast/type_parameters.rs b/vm/src/stdlib/ast/type_parameters.rs
@@ -1,5 +1,5 @@
 use super::*;
-use ruff_source_file::SourceFile;
+use rustpython_compiler_core::SourceFile;
 
 impl Node for ruff::TypeParams {
     fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef {

diff --git a/vm/src/vm/vm_new.rs b/vm/src/vm/vm_new.rs
@@ -12,6 +12,7 @@ use crate::{
     scope::Scope,
     vm::VirtualMachine,
 };
+use rustpython_compiler_core::SourceLocation;
 
 macro_rules! define_exception_fn {
     (
@@ -286,8 +287,6 @@ impl VirtualMachine {
         source: Option<&str>,
         allow_incomplete: bool,
     ) -> PyBaseExceptionRef {
-        use ruff_source_file::SourceLocation;
-
         let syntax_error_type = match &error {
             #[cfg(feature = "parser")]
             // FIXME: this condition will cause TabError even when the matching actual error is IndentationError