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/expression/expr_attribute.rs

@@ -10,7 +10,6 @@ use crate::expression::parentheses::{
 };
 use crate::expression::CallChainLayout;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprAttribute {

crates/ruff_python_formatter/src/expression/expr_await.rs

@@ -1,12 +1,10 @@
-use ruff_python_ast::ExprAwait;
-
 use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::ExprAwait;
 
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses, Parenthesize};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprAwait;

crates/ruff_python_formatter/src/expression/expr_bin_op.rs

@@ -18,7 +18,6 @@ use crate::expression::parentheses::{
 };
 use crate::expression::string::StringLayout;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprBinOp;

crates/ruff_python_formatter/src/expression/expr_call.rs

@@ -6,7 +6,6 @@ use crate::comments::{dangling_comments, SourceComment};
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
 use crate::expression::CallChainLayout;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprCall {

crates/ruff_python_formatter/src/expression/expr_compare.rs

@@ -1,13 +1,13 @@
+use ruff_formatter::{write, FormatOwnedWithRule, FormatRefWithRule};
+use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::{CmpOp, ExprCompare};
+
 use crate::comments::{leading_comments, SourceComment};
 use crate::expression::parentheses::{
     in_parentheses_only_group, in_parentheses_only_soft_line_break_or_space, NeedsParentheses,
     OptionalParentheses,
 };
 use crate::prelude::*;
-use crate::FormatNodeRule;
-use ruff_formatter::{write, FormatOwnedWithRule, FormatRefWithRule};
-use ruff_python_ast::node::AnyNodeRef;
-use ruff_python_ast::{CmpOp, ExprCompare};
 
 #[derive(Default)]
 pub struct FormatExprCompare;

crates/ruff_python_formatter/src/expression/expr_constant.rs

@@ -1,16 +1,15 @@
-use crate::comments::SourceComment;
 use ruff_formatter::FormatRuleWithOptions;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::{Constant, ExprConstant, Ranged};
 use ruff_text_size::{TextLen, TextRange};
 
+use crate::comments::SourceComment;
 use crate::expression::number::{FormatComplex, FormatFloat, FormatInt};
 use crate::expression::parentheses::{should_use_best_fit, NeedsParentheses, OptionalParentheses};
 use crate::expression::string::{
     AnyString, FormatString, StringLayout, StringPrefix, StringQuotes,
 };
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprConstant {

crates/ruff_python_formatter/src/expression/expr_dict.rs

@@ -9,7 +9,6 @@ use crate::expression::parentheses::{
     empty_parenthesized, parenthesized, NeedsParentheses, OptionalParentheses,
 };
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprDict;

crates/ruff_python_formatter/src/expression/expr_dict_comp.rs

@@ -1,14 +1,12 @@
 use ruff_formatter::prelude::{
     format_args, format_with, group, soft_line_break_or_space, space, text,
 };
-use ruff_formatter::{write, Buffer, FormatResult};
+use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprDictComp;
 
-use crate::context::PyFormatContext;
 use crate::expression::parentheses::{parenthesized, NeedsParentheses, OptionalParentheses};
-use crate::AsFormat;
-use crate::{FormatNodeRule, FormattedIterExt, PyFormatter};
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct FormatExprDictComp;

crates/ruff_python_formatter/src/expression/expr_f_string.rs

@@ -1,14 +1,14 @@
-use super::string::{AnyString, FormatString};
-use crate::context::PyFormatContext;
 use memchr::memchr2;
 
-use crate::expression::parentheses::{should_use_best_fit, NeedsParentheses, OptionalParentheses};
-use crate::prelude::*;
-use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::FormatResult;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprFString;
 
+use crate::expression::parentheses::{should_use_best_fit, NeedsParentheses, OptionalParentheses};
+use crate::prelude::*;
+
+use super::string::{AnyString, FormatString};
+
 #[derive(Default)]
 pub struct FormatExprFString;
 

crates/ruff_python_formatter/src/expression/expr_formatted_value.rs

@@ -1,10 +1,9 @@
-use crate::context::PyFormatContext;
-use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
-use crate::{FormatNodeRule, PyFormatter};
-use ruff_formatter::FormatResult;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprFormattedValue;
 
+use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
+use crate::prelude::*;
+
 #[derive(Default)]
 pub struct FormatExprFormattedValue;
 

crates/ruff_python_formatter/src/expression/expr_generator_exp.rs

@@ -3,11 +3,9 @@ use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprGeneratorExp;
 
 use crate::comments::SourceComment;
-use crate::context::PyFormatContext;
+
 use crate::expression::parentheses::{parenthesized, NeedsParentheses, OptionalParentheses};
 use crate::prelude::*;
-use crate::AsFormat;
-use crate::{FormatNodeRule, PyFormatter};
 
 #[derive(Eq, PartialEq, Debug, Default)]
 pub enum GeneratorExpParentheses {

crates/ruff_python_formatter/src/expression/expr_if_exp.rs

@@ -1,13 +1,13 @@
+use ruff_formatter::{format_args, write};
+use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::ExprIfExp;
+
 use crate::comments::leading_comments;
 use crate::expression::parentheses::{
     in_parentheses_only_group, in_parentheses_only_soft_line_break_or_space, NeedsParentheses,
     OptionalParentheses,
 };
 use crate::prelude::*;
-use crate::FormatNodeRule;
-use ruff_formatter::{format_args, write};
-use ruff_python_ast::node::AnyNodeRef;
-use ruff_python_ast::ExprIfExp;
 
 #[derive(Default)]
 pub struct FormatExprIfExp;

crates/ruff_python_formatter/src/expression/expr_ipy_escape_command.rs

@@ -1,6 +1,7 @@
-use crate::prelude::*;
 use ruff_python_ast::{ExprIpyEscapeCommand, Ranged};
 
+use crate::prelude::*;
+
 #[derive(Default)]
 pub struct FormatExprIpyEscapeCommand;
 

crates/ruff_python_formatter/src/expression/expr_lambda.rs

@@ -1,14 +1,11 @@
-use ruff_formatter::prelude::{space, text};
-use ruff_formatter::{write, Buffer, FormatResult};
+use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprLambda;
 
 use crate::comments::{dangling_comments, SourceComment};
-use crate::context::PyFormatContext;
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
 use crate::other::parameters::ParametersParentheses;
-use crate::AsFormat;
-use crate::{FormatNodeRule, PyFormatter};
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct FormatExprLambda;

crates/ruff_python_formatter/src/expression/expr_list.rs

@@ -1,13 +1,12 @@
-use crate::comments::SourceComment;
 use ruff_formatter::prelude::format_with;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::{ExprList, Ranged};
 
+use crate::comments::SourceComment;
 use crate::expression::parentheses::{
     empty_parenthesized, parenthesized, NeedsParentheses, OptionalParentheses,
 };
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprList;

crates/ruff_python_formatter/src/expression/expr_list_comp.rs

@@ -3,11 +3,9 @@ use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprListComp;
 
 use crate::comments::SourceComment;
-use crate::context::PyFormatContext;
+
 use crate::expression::parentheses::{parenthesized, NeedsParentheses, OptionalParentheses};
 use crate::prelude::*;
-use crate::AsFormat;
-use crate::{FormatNodeRule, PyFormatter};
 
 #[derive(Default)]
 pub struct FormatExprListComp;

crates/ruff_python_formatter/src/expression/expr_name.rs

@@ -1,11 +1,11 @@
-use crate::comments::SourceComment;
-use crate::expression::parentheses::{should_use_best_fit, NeedsParentheses, OptionalParentheses};
-use crate::prelude::*;
-use crate::FormatNodeRule;
 use ruff_formatter::{write, FormatContext};
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprName;
 
+use crate::comments::SourceComment;
+use crate::expression::parentheses::{should_use_best_fit, NeedsParentheses, OptionalParentheses};
+use crate::prelude::*;
+
 #[derive(Default)]
 pub struct FormatExprName;
 

crates/ruff_python_formatter/src/expression/expr_named_expr.rs

@@ -1,14 +1,11 @@
-use crate::comments::{dangling_comments, SourceComment};
-use crate::context::PyFormatContext;
-use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
-use crate::{AsFormat, FormatNodeRule, PyFormatter};
-use ruff_formatter::prelude::{
-    format_args, group, hard_line_break, soft_line_break_or_space, space, text,
-};
-use ruff_formatter::{write, Buffer, FormatResult};
+use ruff_formatter::{format_args, write};
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprNamedExpr;
 
+use crate::comments::{dangling_comments, SourceComment};
+use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
+use crate::prelude::*;
+
 #[derive(Default)]
 pub struct FormatExprNamedExpr;
 

crates/ruff_python_formatter/src/expression/expr_set.rs

@@ -1,10 +1,9 @@
-use crate::comments::SourceComment;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::{ExprSet, Ranged};
 
+use crate::comments::SourceComment;
 use crate::expression::parentheses::{parenthesized, NeedsParentheses, OptionalParentheses};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprSet;

crates/ruff_python_formatter/src/expression/expr_set_comp.rs

@@ -3,11 +3,9 @@ use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprSetComp;
 
 use crate::comments::SourceComment;
-use crate::context::PyFormatContext;
+
 use crate::expression::parentheses::{parenthesized, NeedsParentheses, OptionalParentheses};
 use crate::prelude::*;
-use crate::AsFormat;
-use crate::{FormatNodeRule, PyFormatter};
 
 #[derive(Default)]
 pub struct FormatExprSetComp;

crates/ruff_python_formatter/src/expression/expr_slice.rs

@@ -1,15 +1,12 @@
+use ruff_formatter::{write, FormatError};
+use ruff_python_ast::node::{AnyNodeRef, AstNode};
 use ruff_python_ast::{Expr, ExprSlice, ExprUnaryOp, UnaryOp};
+use ruff_python_trivia::{SimpleToken, SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::TextRange;
 
-use ruff_formatter::prelude::{hard_line_break, line_suffix_boundary, space, text};
-use ruff_formatter::{write, Buffer, Format, FormatError, FormatResult};
-use ruff_python_ast::node::{AnyNodeRef, AstNode};
-use ruff_python_trivia::{SimpleToken, SimpleTokenKind, SimpleTokenizer};
-
 use crate::comments::{dangling_comments, SourceComment};
-use crate::context::PyFormatContext;
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
-use crate::{AsFormat, FormatNodeRule, PyFormatter};
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct FormatExprSlice;

crates/ruff_python_formatter/src/expression/expr_starred.rs

@@ -1,13 +1,11 @@
+use ruff_formatter::write;
+use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprStarred;
 
 use crate::comments::{dangling_comments, SourceComment};
-use ruff_formatter::write;
-use ruff_python_ast::node::AnyNodeRef;
 
-use crate::context::PyFormatContext;
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprStarred;

crates/ruff_python_formatter/src/expression/expr_subscript.rs

@@ -3,13 +3,12 @@ use ruff_python_ast::node::{AnyNodeRef, AstNode};
 use ruff_python_ast::{Expr, ExprSubscript};
 
 use crate::comments::{trailing_comments, SourceComment};
-use crate::context::PyFormatContext;
+
 use crate::context::{NodeLevel, WithNodeLevel};
 use crate::expression::expr_tuple::TupleParentheses;
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
 use crate::expression::CallChainLayout;
 use crate::prelude::*;
-use crate::FormatNodeRule;
 
 #[derive(Default)]
 pub struct FormatExprSubscript {

crates/ruff_python_formatter/src/expression/expr_unary_op.rs

@@ -1,16 +1,12 @@
+use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::UnaryOp;
 use ruff_python_ast::{ExprUnaryOp, Ranged};
+use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::{TextLen, TextRange};
 
-use ruff_formatter::prelude::{hard_line_break, space, text};
-use ruff_formatter::{Format, FormatResult};
-use ruff_python_ast::node::AnyNodeRef;
-use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
-
 use crate::comments::trailing_comments;
-use crate::context::PyFormatContext;
 use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
-use crate::{AsFormat, FormatNodeRule, PyFormatter};
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct FormatExprUnaryOp;

crates/ruff_python_formatter/src/expression/expr_yield.rs

@@ -1,13 +1,12 @@
-use crate::context::PyFormatContext;
-use crate::expression::maybe_parenthesize_expression;
-use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses, Parenthesize};
-use crate::prelude::*;
-use crate::{FormatNodeRule, PyFormatter};
 use ruff_formatter::write;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::{Expr, ExprYield, ExprYieldFrom, Ranged};
 use ruff_text_size::TextRange;
 
+use crate::expression::maybe_parenthesize_expression;
+use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses, Parenthesize};
+use crate::prelude::*;
+
 pub(super) enum AnyExpressionYield<'a> {
     Yield(&'a ExprYield),
     YieldFrom(&'a ExprYieldFrom),

crates/ruff_python_formatter/src/expression/expr_yield_from.rs

@@ -1,11 +1,10 @@
-use crate::expression::expr_yield::AnyExpressionYield;
-use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
-use crate::prelude::PyFormatContext;
-use crate::{FormatNodeRule, PyFormatter};
-use ruff_formatter::{Format, FormatResult};
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::ExprYieldFrom;
 
+use crate::expression::expr_yield::AnyExpressionYield;
+use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses};
+use crate::prelude::*;
+
 #[derive(Default)]
 pub struct FormatExprYieldFrom;
 

crates/ruff_python_formatter/src/expression/mod.rs

@@ -1,6 +1,7 @@
-use itertools::Itertools;
 use std::cmp::Ordering;
 
+use itertools::Itertools;
+
 use ruff_formatter::{
     format_args, write, FormatOwnedWithRule, FormatRefWithRule, FormatRule, FormatRuleWithOptions,
 };