Use the formatter prelude in more files (#6882)

Removes a bunch of imports that are made redundant by the prelude.

crates/ruff_python_formatter/src/statement/clause.rs

@@ -1,9 +1,3 @@
-use crate::comments::{
-    leading_alternate_branch_comments, trailing_comments, SourceComment, SuppressionKind,
-};
-use crate::prelude::*;
-use crate::statement::suite::{contains_only_an_ellipsis, SuiteKind};
-use crate::verbatim::write_suppressed_clause_header;
 use ruff_formatter::{write, Argument, Arguments, FormatError};
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::{
@@ -13,6 +7,13 @@ use ruff_python_ast::{
 use ruff_python_trivia::{SimpleToken, SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::{TextRange, TextSize};
 
+use crate::comments::{
+    leading_alternate_branch_comments, trailing_comments, SourceComment, SuppressionKind,
+};
+use crate::prelude::*;
+use crate::statement::suite::{contains_only_an_ellipsis, SuiteKind};
+use crate::verbatim::write_suppressed_clause_header;
+
 /// The header of a compound statement clause.
 ///
 /// > A compound statement consists of one or more ‘clauses.’ A clause consists of a header and a ‘suite.’

crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs

@@ -1,10 +1,10 @@
+use ruff_formatter::write;
+use ruff_python_ast::StmtAnnAssign;
+
 use crate::comments::{SourceComment, SuppressionKind};
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
-use crate::FormatNodeRule;
-use ruff_formatter::write;
-use ruff_python_ast::StmtAnnAssign;
 
 #[derive(Default)]
 pub struct FormatStmtAnnAssign;

crates/ruff_python_formatter/src/statement/stmt_assert.rs

@@ -1,11 +1,12 @@
+use ruff_formatter::prelude::{space, text};
+use ruff_formatter::write;
+use ruff_python_ast::StmtAssert;
+
 use crate::comments::{SourceComment, SuppressionKind};
-use crate::context::PyFormatContext;
+
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
-use crate::{FormatNodeRule, PyFormatter};
-use ruff_formatter::prelude::{space, text};
-use ruff_formatter::{write, Buffer, FormatResult};
-use ruff_python_ast::StmtAssert;
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct FormatStmtAssert;

crates/ruff_python_formatter/src/statement/stmt_assign.rs

@@ -1,12 +1,11 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_formatter::{format_args, write, FormatError};
 use ruff_python_ast::{Expr, StmtAssign};
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::context::{NodeLevel, WithNodeLevel};
 use crate::expression::parentheses::{Parentheses, Parenthesize};
 use crate::expression::{has_own_parentheses, maybe_parenthesize_expression};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtAssign;

crates/ruff_python_formatter/src/statement/stmt_break.rs

@@ -2,7 +2,6 @@ use ruff_python_ast::StmtBreak;
 
 use crate::comments::{SourceComment, SuppressionKind};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtBreak;

crates/ruff_python_formatter/src/statement/stmt_class_def.rs

@@ -4,10 +4,8 @@ use ruff_python_trivia::lines_after_ignoring_trivia;
 
 use crate::comments::{leading_comments, trailing_comments, SourceComment};
 use crate::prelude::*;
-use crate::statement::suite::SuiteKind;
-
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader};
-use crate::FormatNodeRule;
+use crate::statement::suite::SuiteKind;
 
 #[derive(Default)]
 pub struct FormatStmtClassDef;

crates/ruff_python_formatter/src/statement/stmt_continue.rs

@@ -1,8 +1,7 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_python_ast::StmtContinue;
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtContinue;

crates/ruff_python_formatter/src/statement/stmt_delete.rs

@@ -6,7 +6,6 @@ use crate::comments::{dangling_node_comments, SourceComment, SuppressionKind};
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtDelete;

crates/ruff_python_formatter/src/statement/stmt_expr.rs

@@ -1,11 +1,10 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_python_ast as ast;
 use ruff_python_ast::{Expr, Operator, StmtExpr};
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtExpr;

crates/ruff_python_formatter/src/statement/stmt_for.rs

@@ -7,7 +7,6 @@ use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader, ElseClause};
-use crate::FormatNodeRule;
 
 #[derive(Debug)]
 struct ExprTupleWithoutParentheses<'a>(&'a Expr);

crates/ruff_python_formatter/src/statement/stmt_function_def.rs

@@ -9,7 +9,6 @@ use crate::prelude::*;
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader};
 use crate::statement::stmt_class_def::FormatDecorators;
 use crate::statement::suite::SuiteKind;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtFunctionDef;

crates/ruff_python_formatter/src/statement/stmt_global.rs

@@ -1,10 +1,9 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_formatter::{format_args, write};
 use ruff_python_ast::node::AstNode;
 use ruff_python_ast::StmtGlobal;
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtGlobal;

crates/ruff_python_formatter/src/statement/stmt_if.rs

@@ -7,7 +7,6 @@ use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader};
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtIf;

crates/ruff_python_formatter/src/statement/stmt_import.rs

@@ -1,9 +1,8 @@
-use crate::prelude::*;
 use ruff_formatter::{format_args, write};
 use ruff_python_ast::StmtImport;
 
 use crate::comments::{SourceComment, SuppressionKind};
-use crate::FormatNodeRule;
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct FormatStmtImport;

crates/ruff_python_formatter/src/statement/stmt_import_from.rs

@@ -6,7 +6,6 @@ use crate::builders::{parenthesize_if_expands, PyFormatterExtensions, TrailingCo
 use crate::comments::{SourceComment, SuppressionKind};
 use crate::expression::parentheses::parenthesized;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtImportFrom;

crates/ruff_python_formatter/src/statement/stmt_ipy_escape_command.rs

@@ -1,6 +1,7 @@
+use ruff_python_ast::{Ranged, StmtIpyEscapeCommand};
+
 use crate::comments::{SourceComment, SuppressionKind};
 use crate::prelude::*;
-use ruff_python_ast::{Ranged, StmtIpyEscapeCommand};
 
 #[derive(Default)]
 pub struct FormatStmtIpyEscapeCommand;

crates/ruff_python_formatter/src/statement/stmt_match.rs

@@ -7,7 +7,6 @@ use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
 use crate::statement::clause::{clause_header, ClauseHeader};
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtMatch;

crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs

@@ -1,10 +1,9 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_formatter::{format_args, write};
 use ruff_python_ast::node::AstNode;
 use ruff_python_ast::StmtNonlocal;
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtNonlocal;

crates/ruff_python_formatter/src/statement/stmt_pass.rs

@@ -1,8 +1,7 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_python_ast::StmtPass;
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtPass;

crates/ruff_python_formatter/src/statement/stmt_raise.rs

@@ -1,11 +1,10 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_formatter::write;
 use ruff_python_ast::StmtRaise;
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtRaise;

crates/ruff_python_formatter/src/statement/stmt_return.rs

@@ -5,7 +5,6 @@ use crate::comments::{SourceComment, SuppressionKind};
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtReturn;

crates/ruff_python_formatter/src/statement/stmt_try.rs

@@ -8,7 +8,6 @@ use crate::other::except_handler_except_handler::ExceptHandlerKind;
 use crate::prelude::*;
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader, ElseClause};
 use crate::statement::{FormatRefWithRule, Stmt};
-use crate::{FormatNodeRule, PyFormatter};
 
 #[derive(Default)]
 pub struct FormatStmtTry;

crates/ruff_python_formatter/src/statement/stmt_type_alias.rs

@@ -1,11 +1,10 @@
-use crate::comments::{SourceComment, SuppressionKind};
 use ruff_formatter::write;
 use ruff_python_ast::StmtTypeAlias;
 
+use crate::comments::{SourceComment, SuppressionKind};
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtTypeAlias;

crates/ruff_python_formatter/src/statement/stmt_while.rs

@@ -7,7 +7,6 @@ use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::Parenthesize;
 use crate::prelude::*;
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader, ElseClause};
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatStmtWhile;

crates/ruff_python_formatter/src/statement/suite.rs

@@ -1,4 +1,3 @@
-use crate::comments::{leading_comments, trailing_comments, Comments};
 use ruff_formatter::{write, FormatOwnedWithRule, FormatRefWithRule, FormatRuleWithOptions};
 use ruff_python_ast::helpers::is_compound_statement;
 use ruff_python_ast::node::AnyNodeRef;
@@ -6,6 +5,7 @@ use ruff_python_ast::{self as ast, Constant, Expr, ExprConstant, Ranged, Stmt, S
 use ruff_python_trivia::{lines_after_ignoring_trivia, lines_before};
 use ruff_text_size::TextRange;
 
+use crate::comments::{leading_comments, trailing_comments, Comments};
 use crate::context::{NodeLevel, WithNodeLevel};
 use crate::expression::expr_constant::ExprConstantLayout;
 use crate::expression::string::StringLayout;