From edb9b0c62af259f407602f248775d67bc4cfac08 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Fri, 25 Aug 2023 16:51:07 -0400 Subject: [PATCH] Use the formatter prelude in more files (#6882) Removes a bunch of imports that are made redundant by the prelude. --- crates/ruff_python_formatter/generate.py | 5 ++-- .../src/expression/expr_attribute.rs | 1 - .../src/expression/expr_await.rs | 4 +-- .../src/expression/expr_bin_op.rs | 1 - .../src/expression/expr_call.rs | 1 - .../src/expression/expr_compare.rs | 8 ++--- .../src/expression/expr_constant.rs | 3 +- .../src/expression/expr_dict.rs | 1 - .../src/expression/expr_dict_comp.rs | 6 ++-- .../src/expression/expr_f_string.rs | 10 +++---- .../src/expression/expr_formatted_value.rs | 7 ++--- .../src/expression/expr_generator_exp.rs | 4 +-- .../src/expression/expr_if_exp.rs | 8 ++--- .../src/expression/expr_ipy_escape_command.rs | 3 +- .../src/expression/expr_lambda.rs | 7 ++--- .../src/expression/expr_list.rs | 3 +- .../src/expression/expr_list_comp.rs | 4 +-- .../src/expression/expr_name.rs | 8 ++--- .../src/expression/expr_named_expr.rs | 13 ++++----- .../src/expression/expr_set.rs | 3 +- .../src/expression/expr_set_comp.rs | 4 +-- .../src/expression/expr_slice.rs | 11 +++---- .../src/expression/expr_starred.rs | 6 ++-- .../src/expression/expr_subscript.rs | 3 +- .../src/expression/expr_unary_op.rs | 10 ++----- .../src/expression/expr_yield.rs | 9 +++--- .../src/expression/expr_yield_from.rs | 9 +++--- .../src/expression/mod.rs | 3 +- .../ruff_python_formatter/src/module/mod.rs | 6 ++-- .../src/module/mod_expression.rs | 4 +-- .../src/module/mod_module.rs | 7 +++-- .../ruff_python_formatter/src/other/alias.rs | 6 ++-- .../src/other/arguments.rs | 3 +- .../src/other/comprehension.rs | 7 ++--- .../src/other/decorator.rs | 6 ++-- .../src/other/elif_else_clause.rs | 6 ++-- .../other/except_handler_except_handler.rs | 3 +- .../src/other/identifier.rs | 2 +- .../src/other/keyword.rs | 4 +-- .../src/other/match_case.rs | 3 +- .../src/other/parameter.rs | 4 +-- .../src/other/parameter_with_default.rs | 1 - .../src/other/parameters.rs | 1 - .../src/other/with_item.rs | 3 +- .../src/pattern/pattern_match_as.rs | 3 +- .../src/pattern/pattern_match_class.rs | 2 +- .../src/pattern/pattern_match_or.rs | 6 ++-- .../src/pattern/pattern_match_sequence.rs | 5 +--- .../src/pattern/pattern_match_singleton.rs | 3 +- .../src/pattern/pattern_match_star.rs | 2 +- .../src/pattern/pattern_match_value.rs | 1 - .../src/statement/clause.rs | 13 +++++---- .../src/statement/stmt_ann_assign.rs | 6 ++-- .../src/statement/stmt_assert.rs | 11 +++---- .../src/statement/stmt_assign.rs | 3 +- .../src/statement/stmt_break.rs | 1 - .../src/statement/stmt_class_def.rs | 4 +-- .../src/statement/stmt_continue.rs | 3 +- .../src/statement/stmt_delete.rs | 1 - .../src/statement/stmt_expr.rs | 3 +- .../src/statement/stmt_for.rs | 1 - .../src/statement/stmt_function_def.rs | 1 - .../src/statement/stmt_global.rs | 3 +- .../src/statement/stmt_if.rs | 1 - .../src/statement/stmt_import.rs | 3 +- .../src/statement/stmt_import_from.rs | 1 - .../src/statement/stmt_ipy_escape_command.rs | 3 +- .../src/statement/stmt_match.rs | 1 - .../src/statement/stmt_nonlocal.rs | 3 +- .../src/statement/stmt_pass.rs | 3 +- .../src/statement/stmt_raise.rs | 3 +- .../src/statement/stmt_return.rs | 1 - .../src/statement/stmt_try.rs | 1 - .../src/statement/stmt_type_alias.rs | 3 +- .../src/statement/stmt_while.rs | 1 - .../src/statement/suite.rs | 2 +- .../src/type_param/mod.rs | 3 +- .../src/type_param/type_param_clause.rs | 29 ------------------- .../src/type_param/type_param_param_spec.rs | 6 ++-- .../src/type_param/type_param_type_var.rs | 6 ++-- .../type_param/type_param_type_var_tuple.rs | 6 ++-- 81 files changed, 139 insertions(+), 230 deletions(-) delete mode 100644 crates/ruff_python_formatter/src/type_param/type_param_clause.rs diff --git a/crates/ruff_python_formatter/generate.py b/crates/ruff_python_formatter/generate.py index 83ce0415fd..14d8befca6 100755 --- a/crates/ruff_python_formatter/generate.py +++ b/crates/ruff_python_formatter/generate.py @@ -89,9 +89,10 @@ for group, group_nodes in nodes_grouped.items(): continue code = f""" - use crate::{{verbatim_text, FormatNodeRule, PyFormatter}}; - use ruff_formatter::{{write, Buffer, FormatResult}}; + use ruff_formatter::write; use ruff_python_ast::{node}; + use crate::verbatim_text; + use crate::prelude::*; #[derive(Default)] pub struct Format{node}; diff --git a/crates/ruff_python_formatter/src/expression/expr_attribute.rs b/crates/ruff_python_formatter/src/expression/expr_attribute.rs index c00fbd2614..e322f29428 100644 --- a/crates/ruff_python_formatter/src/expression/expr_attribute.rs +++ b/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 { diff --git a/crates/ruff_python_formatter/src/expression/expr_await.rs b/crates/ruff_python_formatter/src/expression/expr_await.rs index b499e90173..25fd244e75 100644 --- a/crates/ruff_python_formatter/src/expression/expr_await.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_bin_op.rs b/crates/ruff_python_formatter/src/expression/expr_bin_op.rs index fd8dd96a9e..8c1f823f43 100644 --- a/crates/ruff_python_formatter/src/expression/expr_bin_op.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_call.rs b/crates/ruff_python_formatter/src/expression/expr_call.rs index 613fa3f091..abb17570d8 100644 --- a/crates/ruff_python_formatter/src/expression/expr_call.rs +++ b/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 { diff --git a/crates/ruff_python_formatter/src/expression/expr_compare.rs b/crates/ruff_python_formatter/src/expression/expr_compare.rs index a217d45db6..2dd82e497b 100644 --- a/crates/ruff_python_formatter/src/expression/expr_compare.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_constant.rs b/crates/ruff_python_formatter/src/expression/expr_constant.rs index 92e3461b75..501c932c5e 100644 --- a/crates/ruff_python_formatter/src/expression/expr_constant.rs +++ b/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 { diff --git a/crates/ruff_python_formatter/src/expression/expr_dict.rs b/crates/ruff_python_formatter/src/expression/expr_dict.rs index 840f973297..3486fdb438 100644 --- a/crates/ruff_python_formatter/src/expression/expr_dict.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_dict_comp.rs b/crates/ruff_python_formatter/src/expression/expr_dict_comp.rs index 333a4082dc..9b615d0461 100644 --- a/crates/ruff_python_formatter/src/expression/expr_dict_comp.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_f_string.rs b/crates/ruff_python_formatter/src/expression/expr_f_string.rs index 2d272ce99c..054990fb7e 100644 --- a/crates/ruff_python_formatter/src/expression/expr_f_string.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_formatted_value.rs b/crates/ruff_python_formatter/src/expression/expr_formatted_value.rs index 12c1a8e0e5..5133cb86e5 100644 --- a/crates/ruff_python_formatter/src/expression/expr_formatted_value.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_generator_exp.rs b/crates/ruff_python_formatter/src/expression/expr_generator_exp.rs index 32fc627f42..706102df39 100644 --- a/crates/ruff_python_formatter/src/expression/expr_generator_exp.rs +++ b/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 { diff --git a/crates/ruff_python_formatter/src/expression/expr_if_exp.rs b/crates/ruff_python_formatter/src/expression/expr_if_exp.rs index 00c78c9b9c..e774b6d0b3 100644 --- a/crates/ruff_python_formatter/src/expression/expr_if_exp.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_ipy_escape_command.rs b/crates/ruff_python_formatter/src/expression/expr_ipy_escape_command.rs index 00afaee756..2989ba9491 100644 --- a/crates/ruff_python_formatter/src/expression/expr_ipy_escape_command.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_lambda.rs b/crates/ruff_python_formatter/src/expression/expr_lambda.rs index b7d7d39b60..3498325222 100644 --- a/crates/ruff_python_formatter/src/expression/expr_lambda.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_list.rs b/crates/ruff_python_formatter/src/expression/expr_list.rs index 47e0a83535..b89c36de0f 100644 --- a/crates/ruff_python_formatter/src/expression/expr_list.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_list_comp.rs b/crates/ruff_python_formatter/src/expression/expr_list_comp.rs index 703126466c..48aa12d0be 100644 --- a/crates/ruff_python_formatter/src/expression/expr_list_comp.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_name.rs b/crates/ruff_python_formatter/src/expression/expr_name.rs index acfd88aad2..80d4169acc 100644 --- a/crates/ruff_python_formatter/src/expression/expr_name.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_named_expr.rs b/crates/ruff_python_formatter/src/expression/expr_named_expr.rs index 98aeb4ceff..01371565eb 100644 --- a/crates/ruff_python_formatter/src/expression/expr_named_expr.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_set.rs b/crates/ruff_python_formatter/src/expression/expr_set.rs index 5027b46380..3ef1c1f150 100644 --- a/crates/ruff_python_formatter/src/expression/expr_set.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_set_comp.rs b/crates/ruff_python_formatter/src/expression/expr_set_comp.rs index eb31a346a7..6d91be7115 100644 --- a/crates/ruff_python_formatter/src/expression/expr_set_comp.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_slice.rs b/crates/ruff_python_formatter/src/expression/expr_slice.rs index ea23e41cdc..4587bd3e60 100644 --- a/crates/ruff_python_formatter/src/expression/expr_slice.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_starred.rs b/crates/ruff_python_formatter/src/expression/expr_starred.rs index 42ee9f7999..9bea9e6e87 100644 --- a/crates/ruff_python_formatter/src/expression/expr_starred.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_subscript.rs b/crates/ruff_python_formatter/src/expression/expr_subscript.rs index 169fbe9c4a..5eadfeb4d0 100644 --- a/crates/ruff_python_formatter/src/expression/expr_subscript.rs +++ b/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 { diff --git a/crates/ruff_python_formatter/src/expression/expr_unary_op.rs b/crates/ruff_python_formatter/src/expression/expr_unary_op.rs index 971f7a2d09..a5e8be6e2b 100644 --- a/crates/ruff_python_formatter/src/expression/expr_unary_op.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/expr_yield.rs b/crates/ruff_python_formatter/src/expression/expr_yield.rs index 077d0eaa89..ad6956c073 100644 --- a/crates/ruff_python_formatter/src/expression/expr_yield.rs +++ b/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), diff --git a/crates/ruff_python_formatter/src/expression/expr_yield_from.rs b/crates/ruff_python_formatter/src/expression/expr_yield_from.rs index 11331015c1..b3194a58a7 100644 --- a/crates/ruff_python_formatter/src/expression/expr_yield_from.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/expression/mod.rs b/crates/ruff_python_formatter/src/expression/mod.rs index e71e803079..52255ec4f4 100644 --- a/crates/ruff_python_formatter/src/expression/mod.rs +++ b/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, }; diff --git a/crates/ruff_python_formatter/src/module/mod.rs b/crates/ruff_python_formatter/src/module/mod.rs index 549cbe1816..7f734f4e66 100644 --- a/crates/ruff_python_formatter/src/module/mod.rs +++ b/crates/ruff_python_formatter/src/module/mod.rs @@ -1,8 +1,8 @@ -use crate::context::PyFormatContext; -use crate::{AsFormat, IntoFormat, PyFormatter}; -use ruff_formatter::{Format, FormatOwnedWithRule, FormatRefWithRule, FormatResult, FormatRule}; +use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule}; use ruff_python_ast::Mod; +use crate::prelude::*; + pub(crate) mod mod_expression; pub(crate) mod mod_module; diff --git a/crates/ruff_python_formatter/src/module/mod_expression.rs b/crates/ruff_python_formatter/src/module/mod_expression.rs index b038976211..79822a2dbb 100644 --- a/crates/ruff_python_formatter/src/module/mod_expression.rs +++ b/crates/ruff_python_formatter/src/module/mod_expression.rs @@ -1,7 +1,7 @@ -use crate::{AsFormat, FormatNodeRule, PyFormatter}; -use ruff_formatter::{Format, FormatResult}; use ruff_python_ast::ModExpression; +use crate::prelude::*; + #[derive(Default)] pub struct FormatModExpression; diff --git a/crates/ruff_python_formatter/src/module/mod_module.rs b/crates/ruff_python_formatter/src/module/mod_module.rs index 654c92aa9b..145ad8a61b 100644 --- a/crates/ruff_python_formatter/src/module/mod_module.rs +++ b/crates/ruff_python_formatter/src/module/mod_module.rs @@ -1,9 +1,10 @@ -use crate::statement::suite::SuiteKind; -use crate::{AsFormat, FormatNodeRule, PyFormatter}; use ruff_formatter::prelude::hard_line_break; -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::ModModule; +use crate::prelude::*; +use crate::statement::suite::SuiteKind; + #[derive(Default)] pub struct FormatModModule; diff --git a/crates/ruff_python_formatter/src/other/alias.rs b/crates/ruff_python_formatter/src/other/alias.rs index 4f577599e2..020c0d77fd 100644 --- a/crates/ruff_python_formatter/src/other/alias.rs +++ b/crates/ruff_python_formatter/src/other/alias.rs @@ -1,8 +1,8 @@ -use crate::{AsFormat, FormatNodeRule, PyFormatter}; -use ruff_formatter::prelude::{space, text}; -use ruff_formatter::{write, Buffer, Format, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::Alias; +use crate::prelude::*; + #[derive(Default)] pub struct FormatAlias; diff --git a/crates/ruff_python_formatter/src/other/arguments.rs b/crates/ruff_python_formatter/src/other/arguments.rs index 6c03eb46e8..05d95f2382 100644 --- a/crates/ruff_python_formatter/src/other/arguments.rs +++ b/crates/ruff_python_formatter/src/other/arguments.rs @@ -1,14 +1,13 @@ -use crate::comments::SourceComment; use ruff_formatter::write; use ruff_python_ast::node::AstNode; use ruff_python_ast::{Arguments, Expr, Ranged}; use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer}; use ruff_text_size::{TextRange, TextSize}; +use crate::comments::SourceComment; use crate::expression::expr_generator_exp::GeneratorExpParentheses; use crate::expression::parentheses::{empty_parenthesized, parenthesized, Parentheses}; use crate::prelude::*; -use crate::FormatNodeRule; #[derive(Default)] pub struct FormatArguments; diff --git a/crates/ruff_python_formatter/src/other/comprehension.rs b/crates/ruff_python_formatter/src/other/comprehension.rs index a71cca2b2d..dad7d14880 100644 --- a/crates/ruff_python_formatter/src/other/comprehension.rs +++ b/crates/ruff_python_formatter/src/other/comprehension.rs @@ -1,10 +1,9 @@ +use ruff_formatter::{format_args, write, Buffer, FormatResult}; +use ruff_python_ast::{Comprehension, Expr, Ranged}; + use crate::comments::{leading_comments, trailing_comments, SourceComment}; use crate::expression::expr_tuple::TupleParentheses; use crate::prelude::*; -use crate::AsFormat; -use crate::{FormatNodeRule, PyFormatter}; -use ruff_formatter::{format_args, write, Buffer, FormatResult}; -use ruff_python_ast::{Comprehension, Expr, Ranged}; #[derive(Default)] pub struct FormatComprehension; diff --git a/crates/ruff_python_formatter/src/other/decorator.rs b/crates/ruff_python_formatter/src/other/decorator.rs index 5ff346fa0f..241afcd125 100644 --- a/crates/ruff_python_formatter/src/other/decorator.rs +++ b/crates/ruff_python_formatter/src/other/decorator.rs @@ -1,10 +1,10 @@ +use ruff_formatter::write; +use ruff_python_ast::Decorator; + 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::Decorator; #[derive(Default)] pub struct FormatDecorator; diff --git a/crates/ruff_python_formatter/src/other/elif_else_clause.rs b/crates/ruff_python_formatter/src/other/elif_else_clause.rs index da1deeb6f1..7568351169 100644 --- a/crates/ruff_python_formatter/src/other/elif_else_clause.rs +++ b/crates/ruff_python_formatter/src/other/elif_else_clause.rs @@ -1,8 +1,8 @@ -use crate::statement::stmt_if::format_elif_else_clause; -use crate::{FormatNodeRule, PyFormatter}; -use ruff_formatter::FormatResult; use ruff_python_ast::ElifElseClause; +use crate::prelude::*; +use crate::statement::stmt_if::format_elif_else_clause; + /// Note that this implementation misses the leading newlines before the leading comments because /// it does not have access to the last node of the previous branch. The `StmtIf` therefore doesn't /// call this but `format_elif_else_clause` directly. diff --git a/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs b/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs index acdf88fcd0..73d4a08195 100644 --- a/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs +++ b/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs @@ -1,5 +1,5 @@ +use ruff_formatter::write; use ruff_formatter::FormatRuleWithOptions; -use ruff_formatter::{write, Buffer, FormatResult}; use ruff_python_ast::ExceptHandlerExceptHandler; use crate::comments::SourceComment; @@ -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, PyFormatter}; #[derive(Copy, Clone, Default)] pub enum ExceptHandlerKind { diff --git a/crates/ruff_python_formatter/src/other/identifier.rs b/crates/ruff_python_formatter/src/other/identifier.rs index 0693c57b03..4c81c3e8e3 100644 --- a/crates/ruff_python_formatter/src/other/identifier.rs +++ b/crates/ruff_python_formatter/src/other/identifier.rs @@ -1,5 +1,5 @@ use crate::prelude::*; -use crate::AsFormat; + use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule}; use ruff_python_ast::{Identifier, Ranged}; diff --git a/crates/ruff_python_formatter/src/other/keyword.rs b/crates/ruff_python_formatter/src/other/keyword.rs index d297ee6af5..ed5ef0cca6 100644 --- a/crates/ruff_python_formatter/src/other/keyword.rs +++ b/crates/ruff_python_formatter/src/other/keyword.rs @@ -1,8 +1,8 @@ -use crate::prelude::*; -use crate::FormatNodeRule; use ruff_formatter::write; use ruff_python_ast::Keyword; +use crate::prelude::*; + #[derive(Default)] pub struct FormatKeyword; diff --git a/crates/ruff_python_formatter/src/other/match_case.rs b/crates/ruff_python_formatter/src/other/match_case.rs index 89c21bffa7..10b60921ca 100644 --- a/crates/ruff_python_formatter/src/other/match_case.rs +++ b/crates/ruff_python_formatter/src/other/match_case.rs @@ -1,4 +1,4 @@ -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::node::AstNode; use ruff_python_ast::MatchCase; @@ -7,7 +7,6 @@ use crate::comments::SourceComment; use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses, Parentheses}; use crate::prelude::*; use crate::statement::clause::{clause_body, clause_header, ClauseHeader}; -use crate::{FormatNodeRule, PyFormatter}; #[derive(Default)] pub struct FormatMatchCase; diff --git a/crates/ruff_python_formatter/src/other/parameter.rs b/crates/ruff_python_formatter/src/other/parameter.rs index dbbbfd8d61..a204e3e8a4 100644 --- a/crates/ruff_python_formatter/src/other/parameter.rs +++ b/crates/ruff_python_formatter/src/other/parameter.rs @@ -1,8 +1,8 @@ -use crate::prelude::*; -use crate::FormatNodeRule; use ruff_formatter::write; use ruff_python_ast::Parameter; +use crate::prelude::*; + #[derive(Default)] pub struct FormatParameter; diff --git a/crates/ruff_python_formatter/src/other/parameter_with_default.rs b/crates/ruff_python_formatter/src/other/parameter_with_default.rs index 3a5e6022ca..40e7508d8d 100644 --- a/crates/ruff_python_formatter/src/other/parameter_with_default.rs +++ b/crates/ruff_python_formatter/src/other/parameter_with_default.rs @@ -2,7 +2,6 @@ use ruff_formatter::write; use ruff_python_ast::ParameterWithDefault; use crate::prelude::*; -use crate::FormatNodeRule; #[derive(Default)] pub struct FormatParameterWithDefault; diff --git a/crates/ruff_python_formatter/src/other/parameters.rs b/crates/ruff_python_formatter/src/other/parameters.rs index c7efcd4dc3..55da9b6952 100644 --- a/crates/ruff_python_formatter/src/other/parameters.rs +++ b/crates/ruff_python_formatter/src/other/parameters.rs @@ -13,7 +13,6 @@ use crate::comments::{ use crate::context::{NodeLevel, WithNodeLevel}; use crate::expression::parentheses::empty_parenthesized; use crate::prelude::*; -use crate::FormatNodeRule; #[derive(Debug, Copy, Clone, Eq, PartialEq, Default)] pub enum ParametersParentheses { diff --git a/crates/ruff_python_formatter/src/other/with_item.rs b/crates/ruff_python_formatter/src/other/with_item.rs index 3d8e373636..fd91501c06 100644 --- a/crates/ruff_python_formatter/src/other/with_item.rs +++ b/crates/ruff_python_formatter/src/other/with_item.rs @@ -1,11 +1,10 @@ -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::WithItem; use crate::comments::SourceComment; use crate::expression::maybe_parenthesize_expression; use crate::expression::parentheses::{parenthesized, Parentheses, Parenthesize}; use crate::prelude::*; -use crate::{FormatNodeRule, PyFormatter}; #[derive(Default)] pub struct FormatWithItem; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs index c6dc298e3e..d16f4884d3 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs @@ -1,11 +1,10 @@ -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::node::AnyNodeRef; use ruff_python_ast::PatternMatchAs; use crate::comments::{dangling_comments, SourceComment}; use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses}; use crate::prelude::*; -use crate::{FormatNodeRule, PyFormatter}; #[derive(Default)] pub struct FormatPatternMatchAs; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs index 2cbe058ba6..1dab6fb25c 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs @@ -1,10 +1,10 @@ -use crate::comments::{dangling_comments, SourceComment}; use ruff_formatter::write; use ruff_python_ast::node::AnyNodeRef; use ruff_python_ast::{Pattern, PatternMatchClass, Ranged}; use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer}; use ruff_text_size::{TextRange, TextSize}; +use crate::comments::{dangling_comments, SourceComment}; use crate::expression::parentheses::{ empty_parenthesized, parenthesized, NeedsParentheses, OptionalParentheses, Parentheses, }; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs index 6d7e624ae8..847c7597d7 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs @@ -1,10 +1,10 @@ -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::node::AnyNodeRef; use ruff_python_ast::PatternMatchOr; -use crate::context::PyFormatContext; use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses}; -use crate::{not_yet_implemented_custom_text, FormatNodeRule, PyFormatter}; +use crate::not_yet_implemented_custom_text; +use crate::prelude::*; #[derive(Default)] pub struct FormatPatternMatchOr; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs index c9346c4e46..1e039ffe56 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs @@ -1,16 +1,13 @@ -use ruff_formatter::prelude::format_with; use ruff_formatter::{Format, FormatResult}; use ruff_python_ast::node::AnyNodeRef; use ruff_python_ast::{PatternMatchSequence, Ranged}; use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer}; use ruff_text_size::TextRange; -use crate::builders::PyFormatterExtensions; -use crate::context::PyFormatContext; use crate::expression::parentheses::{ empty_parenthesized, optional_parentheses, parenthesized, NeedsParentheses, OptionalParentheses, }; -use crate::{FormatNodeRule, PyFormatter}; +use crate::prelude::*; #[derive(Default)] pub struct FormatPatternMatchSequence; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs index 5017a9fa88..56b0c223da 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs @@ -1,9 +1,8 @@ -use crate::prelude::*; use ruff_python_ast::node::AnyNodeRef; use ruff_python_ast::{Constant, PatternMatchSingleton}; use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses}; -use crate::{FormatNodeRule, PyFormatter}; +use crate::prelude::*; #[derive(Default)] pub struct FormatPatternMatchSingleton; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs index 35978eb386..8b93d2b81c 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs @@ -1,4 +1,4 @@ -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::node::AnyNodeRef; use ruff_python_ast::PatternMatchStar; diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs index dc1b090b7a..e513ef2fcf 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs @@ -3,7 +3,6 @@ use ruff_python_ast::PatternMatchValue; use crate::expression::parentheses::{NeedsParentheses, OptionalParentheses, Parentheses}; use crate::prelude::*; -use crate::{AsFormat, FormatNodeRule, PyFormatter}; #[derive(Default)] pub struct FormatPatternMatchValue; diff --git a/crates/ruff_python_formatter/src/statement/clause.rs b/crates/ruff_python_formatter/src/statement/clause.rs index 81963ae0ca..5e1644cf40 100644 --- a/crates/ruff_python_formatter/src/statement/clause.rs +++ b/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.’ diff --git a/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs index ebfb1e0f78..6edc0a1320 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_assert.rs b/crates/ruff_python_formatter/src/statement/stmt_assert.rs index eb5a859a25..ae47813283 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_assert.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_assign.rs index d22e7adb0f..3f9b36aa0a 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_assign.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_break.rs b/crates/ruff_python_formatter/src/statement/stmt_break.rs index b35a884043..394cd03f74 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_break.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_class_def.rs b/crates/ruff_python_formatter/src/statement/stmt_class_def.rs index a8f87c46ea..2f64bbdb7d 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_class_def.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_continue.rs b/crates/ruff_python_formatter/src/statement/stmt_continue.rs index 88c43877d8..625f2d8fce 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_continue.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_delete.rs b/crates/ruff_python_formatter/src/statement/stmt_delete.rs index 7cf79dfe31..67654507e2 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_delete.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_expr.rs b/crates/ruff_python_formatter/src/statement/stmt_expr.rs index ff30886fb0..ae2b45bad2 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_expr.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_for.rs b/crates/ruff_python_formatter/src/statement/stmt_for.rs index 67020e5344..360c6839a2 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_for.rs +++ b/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); diff --git a/crates/ruff_python_formatter/src/statement/stmt_function_def.rs b/crates/ruff_python_formatter/src/statement/stmt_function_def.rs index 764f3487c3..1e547481dd 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_function_def.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_global.rs b/crates/ruff_python_formatter/src/statement/stmt_global.rs index 620848c2c9..c837daff08 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_global.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_if.rs b/crates/ruff_python_formatter/src/statement/stmt_if.rs index 5f19c2cd6c..a842ddf53f 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_if.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_import.rs b/crates/ruff_python_formatter/src/statement/stmt_import.rs index a8cdba2d08..d4c10af939 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_import.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_import_from.rs b/crates/ruff_python_formatter/src/statement/stmt_import_from.rs index fb894f7e2b..dcfa272339 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_import_from.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_ipy_escape_command.rs b/crates/ruff_python_formatter/src/statement/stmt_ipy_escape_command.rs index 6af1da6ad2..2cbef034c2 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_ipy_escape_command.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_match.rs b/crates/ruff_python_formatter/src/statement/stmt_match.rs index 9b1a3b1ad3..b89c6018a3 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_match.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs b/crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs index c185b2ec69..53884c6f40 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_pass.rs b/crates/ruff_python_formatter/src/statement/stmt_pass.rs index b0cc9bd123..9a5c5249e2 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_pass.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_raise.rs b/crates/ruff_python_formatter/src/statement/stmt_raise.rs index 1f69f4084c..e8c11228de 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_raise.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_return.rs b/crates/ruff_python_formatter/src/statement/stmt_return.rs index 133f130e80..61beea83e6 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_return.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_try.rs b/crates/ruff_python_formatter/src/statement/stmt_try.rs index cfae87be7d..39a98f5429 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_try.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_type_alias.rs b/crates/ruff_python_formatter/src/statement/stmt_type_alias.rs index 4c1be67718..ddb82ebfe7 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_type_alias.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/stmt_while.rs b/crates/ruff_python_formatter/src/statement/stmt_while.rs index e409978b6c..cb13a9063a 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_while.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/statement/suite.rs b/crates/ruff_python_formatter/src/statement/suite.rs index 24dca3ffc2..7ac1c61fb8 100644 --- a/crates/ruff_python_formatter/src/statement/suite.rs +++ b/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; diff --git a/crates/ruff_python_formatter/src/type_param/mod.rs b/crates/ruff_python_formatter/src/type_param/mod.rs index 07c5f0349f..65b7e9c2b7 100644 --- a/crates/ruff_python_formatter/src/type_param/mod.rs +++ b/crates/ruff_python_formatter/src/type_param/mod.rs @@ -1,7 +1,8 @@ -use crate::prelude::*; use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule}; use ruff_python_ast::TypeParam; +use crate::prelude::*; + pub(crate) mod type_param_param_spec; pub(crate) mod type_param_type_var; pub(crate) mod type_param_type_var_tuple; diff --git a/crates/ruff_python_formatter/src/type_param/type_param_clause.rs b/crates/ruff_python_formatter/src/type_param/type_param_clause.rs deleted file mode 100644 index 18549e26c2..0000000000 --- a/crates/ruff_python_formatter/src/type_param/type_param_clause.rs +++ /dev/null @@ -1,29 +0,0 @@ -use crate::builders::PyFormatterExtensions; -use crate::context::PyFormatContext; -use crate::expression::parentheses::parenthesized; -use crate::prelude::*; -use ruff_formatter::{Format, FormatResult}; -use ruff_python_ast::TypeParam; -use ruff_text_size::TextSize; - -pub(crate) struct FormatTypeParamsClause<'a> { - pub(crate) sequence_end: TextSize, - pub(crate) type_params: &'a Vec, -} - -/// Formats a sequence of [`TypeParam`] nodes. -impl Format> for FormatTypeParamsClause<'_> { - fn fmt(&self, f: &mut PyFormatter) -> FormatResult<()> { - if self.type_params.is_empty() { - return Ok(()); - } - - let items = format_with(|f| { - f.join_comma_separated(self.sequence_end) - .nodes(self.type_params.iter()) - .finish() - }); - - parenthesized("[", &items, "]").fmt(f) - } -} diff --git a/crates/ruff_python_formatter/src/type_param/type_param_param_spec.rs b/crates/ruff_python_formatter/src/type_param/type_param_param_spec.rs index ad99dfc4c5..f9a3a7ed73 100644 --- a/crates/ruff_python_formatter/src/type_param/type_param_param_spec.rs +++ b/crates/ruff_python_formatter/src/type_param/type_param_param_spec.rs @@ -1,8 +1,8 @@ -use crate::{AsFormat, FormatNodeRule, PyFormatter}; -use ruff_formatter::prelude::text; -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::TypeParamParamSpec; +use crate::prelude::*; + #[derive(Default)] pub struct FormatTypeParamParamSpec; diff --git a/crates/ruff_python_formatter/src/type_param/type_param_type_var.rs b/crates/ruff_python_formatter/src/type_param/type_param_type_var.rs index c6f9812cbb..8a86f90592 100644 --- a/crates/ruff_python_formatter/src/type_param/type_param_type_var.rs +++ b/crates/ruff_python_formatter/src/type_param/type_param_type_var.rs @@ -1,8 +1,8 @@ -use crate::{AsFormat, FormatNodeRule, PyFormatter}; -use ruff_formatter::prelude::{space, text}; -use ruff_formatter::{write, Buffer, Format, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::TypeParamTypeVar; +use crate::prelude::*; + #[derive(Default)] pub struct FormatTypeParamTypeVar; diff --git a/crates/ruff_python_formatter/src/type_param/type_param_type_var_tuple.rs b/crates/ruff_python_formatter/src/type_param/type_param_type_var_tuple.rs index d9e6640822..66d1a5307e 100644 --- a/crates/ruff_python_formatter/src/type_param/type_param_type_var_tuple.rs +++ b/crates/ruff_python_formatter/src/type_param/type_param_type_var_tuple.rs @@ -1,8 +1,8 @@ -use crate::{AsFormat, FormatNodeRule, PyFormatter}; -use ruff_formatter::prelude::text; -use ruff_formatter::{write, Buffer, FormatResult}; +use ruff_formatter::write; use ruff_python_ast::TypeParamTypeVarTuple; +use crate::prelude::*; + #[derive(Default)] pub struct FormatTypeParamTypeVarTuple;