Remove parser dependency from ruff-python-ast (#6096)

crates/ruff_python_formatter/src/expression/expr_attribute.rs

@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprAttribute, ExprConstant};
+use rustpython_ast::{Constant, Expr, ExprAttribute, ExprConstant};
 
 use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/expression/expr_await.rs

@@ -1,4 +1,4 @@
-use rustpython_parser::ast::ExprAwait;
+use rustpython_ast::ExprAwait;
 
 use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/expression/expr_bin_op.rs

@@ -1,6 +1,6 @@
 use std::iter;
 
-use rustpython_parser::ast::{
+use rustpython_ast::{
     Constant, Expr, ExprAttribute, ExprBinOp, ExprConstant, ExprUnaryOp, Operator, UnaryOp,
 };
 use smallvec::SmallVec;

crates/ruff_python_formatter/src/expression/expr_bool_op.rs

@@ -6,7 +6,7 @@ use crate::expression::parentheses::{
 use crate::prelude::*;
 use ruff_formatter::{write, FormatOwnedWithRule, FormatRefWithRule, FormatRuleWithOptions};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::{BoolOp, ExprBoolOp};
+use rustpython_ast::{BoolOp, ExprBoolOp};
 
 #[derive(Default)]
 pub struct FormatExprBoolOp {

crates/ruff_python_formatter/src/expression/expr_call.rs

@@ -1,5 +1,5 @@
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Expr, ExprCall, Ranged};
+use rustpython_ast::{Expr, ExprCall, Ranged};
 
 use crate::builders::empty_parenthesized_with_dangling_comments;
 use ruff_formatter::write;

crates/ruff_python_formatter/src/expression/expr_compare.rs

@@ -7,7 +7,7 @@ use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_formatter::{write, FormatOwnedWithRule, FormatRefWithRule, FormatRuleWithOptions};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::{CmpOp, ExprCompare};
+use rustpython_ast::{CmpOp, ExprCompare};
 
 #[derive(Default)]
 pub struct FormatExprCompare {

crates/ruff_python_formatter/src/expression/expr_constant.rs

@@ -1,5 +1,5 @@
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser::ast::{Constant, ExprConstant, Ranged};
+use rustpython_ast::{Constant, ExprConstant, Ranged};
 
 use ruff_formatter::FormatRuleWithOptions;
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/expression/expr_dict.rs

@@ -6,8 +6,8 @@ use crate::FormatNodeRule;
 use ruff_formatter::{format_args, write};
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::Ranged;
-use rustpython_parser::ast::{Expr, ExprDict};
+use rustpython_ast::Ranged;
+use rustpython_ast::{Expr, ExprDict};
 
 #[derive(Default)]
 pub struct FormatExprDict;

crates/ruff_python_formatter/src/expression/expr_dict_comp.rs

@@ -7,7 +7,7 @@ use ruff_formatter::prelude::{
 };
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprDictComp;
+use rustpython_ast::ExprDictComp;
 
 #[derive(Default)]
 pub struct FormatExprDictComp;

crates/ruff_python_formatter/src/expression/expr_formatted_value.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
 use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprFormattedValue;
+use rustpython_ast::ExprFormattedValue;
 
 #[derive(Default)]
 pub struct FormatExprFormattedValue;

crates/ruff_python_formatter/src/expression/expr_generator_exp.rs

@@ -6,7 +6,7 @@ use crate::AsFormat;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::{format_args, write, Buffer, FormatResult, FormatRuleWithOptions};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprGeneratorExp;
+use rustpython_ast::ExprGeneratorExp;
 
 #[derive(Eq, PartialEq, Debug, Default)]
 pub enum GeneratorExpParentheses {

crates/ruff_python_formatter/src/expression/expr_if_exp.rs

@@ -7,7 +7,7 @@ use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_formatter::{format_args, write};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprIfExp;
+use rustpython_ast::ExprIfExp;
 
 #[derive(Default)]
 pub struct FormatExprIfExp;

crates/ruff_python_formatter/src/expression/expr_joined_str.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
 use crate::{not_yet_implemented_custom_text, FormatNodeRule, PyFormatter};
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprJoinedStr;
+use rustpython_ast::ExprJoinedStr;
 
 #[derive(Default)]
 pub struct FormatExprJoinedStr;

crates/ruff_python_formatter/src/expression/expr_lambda.rs

@@ -7,7 +7,7 @@ use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprLambda;
+use rustpython_ast::ExprLambda;
 
 #[derive(Default)]
 pub struct FormatExprLambda;

crates/ruff_python_formatter/src/expression/expr_list.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::{parenthesized, NeedsParentheses, OptionalPa
 use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::{ExprList, Ranged};
+use rustpython_ast::{ExprList, Ranged};
 
 #[derive(Default)]
 pub struct FormatExprList;

crates/ruff_python_formatter/src/expression/expr_list_comp.rs

@@ -5,7 +5,7 @@ use crate::AsFormat;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::{format_args, write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprListComp;
+use rustpython_ast::ExprListComp;
 
 #[derive(Default)]
 pub struct FormatExprListComp;

crates/ruff_python_formatter/src/expression/expr_name.rs

@@ -3,7 +3,7 @@ use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_formatter::{write, FormatContext};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprName;
+use rustpython_ast::ExprName;
 
 #[derive(Default)]
 pub struct FormatExprName;
@@ -37,7 +37,7 @@ impl NeedsParentheses for ExprName {
 #[cfg(test)]
 mod tests {
     use ruff_text_size::{TextRange, TextSize};
-    use rustpython_parser::ast::{ModModule, Ranged};
+    use rustpython_ast::{ModModule, Ranged};
     use rustpython_parser::Parse;
 
     #[test]

crates/ruff_python_formatter/src/expression/expr_named_expr.rs

@@ -4,7 +4,7 @@ use crate::{AsFormat, FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprNamedExpr;
+use rustpython_ast::ExprNamedExpr;
 
 #[derive(Default)]
 pub struct FormatExprNamedExpr;

crates/ruff_python_formatter/src/expression/expr_set.rs

@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{ExprSet, Ranged};
+use rustpython_ast::{ExprSet, Ranged};
 
 use ruff_python_ast::node::AnyNodeRef;
 

crates/ruff_python_formatter/src/expression/expr_set_comp.rs

@@ -5,7 +5,7 @@ use crate::AsFormat;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::{format_args, write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprSetComp;
+use rustpython_ast::ExprSetComp;
 
 #[derive(Default)]
 pub struct FormatExprSetComp;

crates/ruff_python_formatter/src/expression/expr_slice.rs

@@ -1,5 +1,5 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprSlice, ExprUnaryOp, Ranged, UnaryOp};
+use rustpython_ast::{Expr, ExprSlice, ExprUnaryOp, Ranged, UnaryOp};
 
 use ruff_formatter::prelude::{hard_line_break, line_suffix_boundary, space, text};
 use ruff_formatter::{write, Buffer, Format, FormatError, FormatResult};

crates/ruff_python_formatter/src/expression/expr_starred.rs

@@ -1,4 +1,4 @@
-use rustpython_parser::ast::ExprStarred;
+use rustpython_ast::ExprStarred;
 
 use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/expression/expr_subscript.rs

@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprSubscript};
+use rustpython_ast::{Expr, ExprSubscript};
 
 use ruff_formatter::{format_args, write};
 use ruff_python_ast::node::{AnyNodeRef, AstNode};

crates/ruff_python_formatter/src/expression/expr_tuple.rs

@@ -1,6 +1,6 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::ExprTuple;
-use rustpython_parser::ast::{Expr, Ranged};
+use rustpython_ast::ExprTuple;
+use rustpython_ast::{Expr, Ranged};
 
 use ruff_formatter::{format_args, write, FormatRuleWithOptions};
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/expression/expr_unary_op.rs

@@ -1,6 +1,6 @@
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser::ast::UnaryOp;
-use rustpython_parser::ast::{ExprUnaryOp, Ranged};
+use rustpython_ast::UnaryOp;
+use rustpython_ast::{ExprUnaryOp, Ranged};
 
 use ruff_formatter::prelude::{hard_line_break, space, text};
 use ruff_formatter::{Format, FormatContext, FormatResult};

crates/ruff_python_formatter/src/expression/expr_yield.rs

@@ -5,7 +5,7 @@ use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprYield;
+use rustpython_ast::ExprYield;
 
 #[derive(Default)]
 pub struct FormatExprYield;

crates/ruff_python_formatter/src/expression/expr_yield_from.rs

@@ -5,7 +5,7 @@ use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_parser::ast::ExprYieldFrom;
+use rustpython_ast::ExprYieldFrom;
 
 #[derive(Default)]
 pub struct FormatExprYieldFrom;

crates/ruff_python_formatter/src/expression/mod.rs

@@ -1,7 +1,7 @@
 use std::cmp::Ordering;
 
+use rustpython_ast::{Expr, Operator};
 use rustpython_parser::ast;
-use rustpython_parser::ast::{Expr, Operator};
 
 use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule, FormatRule, FormatRuleWithOptions};
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/expression/number.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use ruff_text_size::TextSize;
-use rustpython_parser::ast::{ExprConstant, Ranged};
+use rustpython_ast::{ExprConstant, Ranged};
 
 use crate::prelude::*;
 

crates/ruff_python_formatter/src/expression/parentheses.rs

@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Ranged;
+use rustpython_ast::Ranged;
 
 use ruff_formatter::prelude::tag::Condition;
 use ruff_formatter::{format_args, write, Argument, Arguments};

crates/ruff_python_formatter/src/expression/string.rs

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use bitflags::bitflags;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_parser::ast::{ExprConstant, Ranged};
+use rustpython_ast::{ExprConstant, Ranged};
 use rustpython_parser::lexer::{lex_starts_at, LexicalError, LexicalErrorType};
 use rustpython_parser::{Mode, Tok};