Pull in RustPython parser (#6099)

crates/ruff_python_formatter/src/statement/mod.rs

@@ -1,6 +1,6 @@
 use crate::prelude::*;
 use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule};
-use rustpython_ast::Stmt;
+use ruff_python_ast::Stmt;
 
 pub(crate) mod stmt_ann_assign;
 pub(crate) mod stmt_assert;

crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_formatter::write;
-use rustpython_ast::StmtAnnAssign;
+use ruff_python_ast::StmtAnnAssign;
 
 #[derive(Default)]
 pub struct FormatStmtAnnAssign;

crates/ruff_python_formatter/src/statement/stmt_assert.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::Parenthesize;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtAssert;
+use ruff_python_ast::StmtAssert;
 
 #[derive(Default)]
 pub struct FormatStmtAssert;

crates/ruff_python_formatter/src/statement/stmt_assign.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, StmtAssign};
+use ruff_python_ast::{Expr, StmtAssign};
 
 use ruff_formatter::{format_args, write, FormatError};
 

crates/ruff_python_formatter/src/statement/stmt_async_for.rs

@@ -2,7 +2,7 @@ use crate::prelude::*;
 use crate::statement::stmt_for::AnyStatementFor;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::FormatResult;
-use rustpython_ast::StmtAsyncFor;
+use ruff_python_ast::StmtAsyncFor;
 
 #[derive(Default)]
 pub struct FormatStmtAsyncFor;

crates/ruff_python_formatter/src/statement/stmt_async_function_def.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::StmtAsyncFunctionDef;
+use ruff_python_ast::StmtAsyncFunctionDef;
 
 use ruff_python_ast::function::AnyFunctionDefinition;
 

crates/ruff_python_formatter/src/statement/stmt_async_with.rs

@@ -1,7 +1,7 @@
 use crate::prelude::*;
 use crate::statement::stmt_with::AnyStatementWith;
 use crate::FormatNodeRule;
-use rustpython_ast::StmtAsyncWith;
+use ruff_python_ast::StmtAsyncWith;
 
 #[derive(Default)]
 pub struct FormatStmtAsyncWith;

crates/ruff_python_formatter/src/statement/stmt_aug_assign.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::Parenthesize;
 use crate::{AsFormat, FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtAugAssign;
+use ruff_python_ast::StmtAugAssign;
 
 #[derive(Default)]
 pub struct FormatStmtAugAssign;

crates/ruff_python_formatter/src/statement/stmt_break.rs

@@ -1,7 +1,7 @@
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::text;
 use ruff_formatter::{Format, FormatResult};
-use rustpython_ast::StmtBreak;
+use ruff_python_ast::StmtBreak;
 
 #[derive(Default)]
 pub struct FormatStmtBreak;

crates/ruff_python_formatter/src/statement/stmt_class_def.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{Ranged, StmtClassDef};
 use ruff_text_size::TextRange;
-use rustpython_ast::{Ranged, StmtClassDef};
 
 use ruff_formatter::write;
 use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};

crates/ruff_python_formatter/src/statement/stmt_continue.rs

@@ -1,7 +1,7 @@
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::text;
 use ruff_formatter::{Format, FormatResult};
-use rustpython_ast::StmtContinue;
+use ruff_python_ast::StmtContinue;
 
 #[derive(Default)]
 pub struct FormatStmtContinue;

crates/ruff_python_formatter/src/statement/stmt_delete.rs

@@ -5,7 +5,7 @@ use crate::expression::parentheses::Parenthesize;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{block_indent, format_with, space, text};
 use ruff_formatter::{write, Buffer, Format, FormatResult};
-use rustpython_ast::{Ranged, StmtDelete};
+use ruff_python_ast::{Ranged, StmtDelete};
 
 #[derive(Default)]
 pub struct FormatStmtDelete;

crates/ruff_python_formatter/src/statement/stmt_expr.rs

@@ -1,5 +1,5 @@
-use rustpython_ast::{Expr, Operator, StmtExpr};
-use rustpython_parser::ast;
+use ruff_python_ast as ast;
+use ruff_python_ast::{Expr, Operator, StmtExpr};
 
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;

crates/ruff_python_formatter/src/statement/stmt_for.rs

@@ -6,8 +6,8 @@ use crate::prelude::*;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::{format_args, write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::{Expr, Ranged, Stmt, StmtAsyncFor, StmtFor, Suite};
 use ruff_text_size::TextRange;
-use rustpython_ast::{Expr, Ranged, Stmt, StmtAsyncFor, StmtFor, Suite};
 
 #[derive(Debug)]
 struct ExprTupleWithoutParentheses<'a>(&'a Expr);

crates/ruff_python_formatter/src/statement/stmt_function_def.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Ranged, StmtFunctionDef};
+use ruff_python_ast::{Ranged, StmtFunctionDef};
 
 use ruff_formatter::{write, FormatOwnedWithRule, FormatRefWithRule};
 use ruff_python_ast::function::AnyFunctionDefinition;

crates/ruff_python_formatter/src/statement/stmt_global.rs

@@ -1,6 +1,6 @@
 use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtGlobal;
+use ruff_python_ast::StmtGlobal;
 
 #[derive(Default)]
 pub struct FormatStmtGlobal;

crates/ruff_python_formatter/src/statement/stmt_if.rs

@@ -5,7 +5,7 @@ use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;
-use rustpython_ast::{ElifElseClause, StmtIf};
+use ruff_python_ast::{ElifElseClause, StmtIf};
 
 #[derive(Default)]
 pub struct FormatStmtIf;

crates/ruff_python_formatter/src/statement/stmt_import.rs

@@ -1,7 +1,7 @@
 use crate::{FormatNodeRule, FormattedIterExt, PyFormatter};
 use ruff_formatter::prelude::{format_args, format_with, space, text};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtImport;
+use ruff_python_ast::StmtImport;
 
 #[derive(Default)]
 pub struct FormatStmtImport;

crates/ruff_python_formatter/src/statement/stmt_import_from.rs

@@ -2,7 +2,7 @@ use crate::builders::{parenthesize_if_expands, PyFormatterExtensions};
 use crate::{AsFormat, FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{dynamic_text, format_with, space, text};
 use ruff_formatter::{write, Buffer, Format, FormatResult};
-use rustpython_ast::{Ranged, StmtImportFrom};
+use ruff_python_ast::{Ranged, StmtImportFrom};
 
 #[derive(Default)]
 pub struct FormatStmtImportFrom;

crates/ruff_python_formatter/src/statement/stmt_match.rs

@@ -1,6 +1,6 @@
 use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtMatch;
+use ruff_python_ast::StmtMatch;
 
 #[derive(Default)]
 pub struct FormatStmtMatch;

crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs

@@ -1,6 +1,6 @@
 use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtNonlocal;
+use ruff_python_ast::StmtNonlocal;
 
 #[derive(Default)]
 pub struct FormatStmtNonlocal;

crates/ruff_python_formatter/src/statement/stmt_pass.rs

@@ -1,7 +1,7 @@
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::text;
 use ruff_formatter::{Format, FormatResult};
-use rustpython_ast::StmtPass;
+use ruff_python_ast::StmtPass;
 
 #[derive(Default)]
 pub struct FormatStmtPass;

crates/ruff_python_formatter/src/statement/stmt_raise.rs

@@ -4,7 +4,7 @@ use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, Format, FormatResult};
 
 use crate::expression::maybe_parenthesize_expression;
-use rustpython_ast::StmtRaise;
+use ruff_python_ast::StmtRaise;
 
 #[derive(Default)]
 pub struct FormatStmtRaise;

crates/ruff_python_formatter/src/statement/stmt_return.rs

@@ -3,7 +3,7 @@ use crate::expression::parentheses::Parenthesize;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::prelude::{space, text};
 use ruff_formatter::{write, Buffer, Format, FormatResult};
-use rustpython_ast::StmtReturn;
+use ruff_python_ast::StmtReturn;
 
 #[derive(Default)]
 pub struct FormatStmtReturn;

crates/ruff_python_formatter/src/statement/stmt_try.rs

@@ -9,8 +9,8 @@ use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::FormatRuleWithOptions;
 use ruff_formatter::{write, Buffer, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::{ExceptHandler, Ranged, StmtTry, StmtTryStar, Suite};
 use ruff_text_size::TextRange;
-use rustpython_ast::{ExceptHandler, Ranged, StmtTry, StmtTryStar, Suite};
 
 pub(super) enum AnyStatementTry<'a> {
     Try(&'a StmtTry),

crates/ruff_python_formatter/src/statement/stmt_try_star.rs

@@ -2,7 +2,7 @@ use crate::statement::stmt_try::AnyStatementTry;
 use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::Format;
 use ruff_formatter::FormatResult;
-use rustpython_ast::StmtTryStar;
+use ruff_python_ast::StmtTryStar;
 
 #[derive(Default)]
 pub struct FormatStmtTryStar;

crates/ruff_python_formatter/src/statement/stmt_type_alias.rs

@@ -1,6 +1,6 @@
 use crate::{not_yet_implemented_custom_text, FormatNodeRule, PyFormatter};
 use ruff_formatter::{write, Buffer, FormatResult};
-use rustpython_ast::StmtTypeAlias;
+use ruff_python_ast::StmtTypeAlias;
 
 #[derive(Default)]
 pub struct FormatStmtTypeAlias;

crates/ruff_python_formatter/src/statement/stmt_while.rs

@@ -5,7 +5,7 @@ use crate::prelude::*;
 use crate::FormatNodeRule;
 use ruff_formatter::write;
 use ruff_python_ast::node::AstNode;
-use rustpython_ast::{Ranged, Stmt, StmtWhile};
+use ruff_python_ast::{Ranged, Stmt, StmtWhile};
 
 #[derive(Default)]
 pub struct FormatStmtWhile;

crates/ruff_python_formatter/src/statement/stmt_with.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{Ranged, StmtAsyncWith, StmtWith, Suite, WithItem};
 use ruff_text_size::TextRange;
-use rustpython_ast::{Ranged, StmtAsyncWith, StmtWith, Suite, WithItem};
 
 use ruff_formatter::{format_args, write, FormatError};
 use ruff_python_ast::node::AnyNodeRef;

crates/ruff_python_formatter/src/statement/suite.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Ranged, Stmt, Suite};
+use ruff_python_ast::{Ranged, Stmt, Suite};
 
 use ruff_formatter::{
     format_args, write, FormatOwnedWithRule, FormatRefWithRule, FormatRuleWithOptions,
@@ -170,8 +170,8 @@ impl<'ast> IntoFormat<PyFormatContext<'ast>> for Suite {
 
 #[cfg(test)]
 mod tests {
-    use rustpython_ast::Suite;
-    use rustpython_parser::Parse;
+    use ruff_python_ast::Suite;
+    use ruff_python_parser::Parse;
 
     use ruff_formatter::format;