diff --git a/crates/ruff/src/ast/branch_detection.rs b/crates/ruff/src/ast/branch_detection.rs index 67bc19f08f..fa22dccad5 100644 --- a/crates/ruff/src/ast/branch_detection.rs +++ b/crates/ruff/src/ast/branch_detection.rs @@ -1,9 +1,8 @@ use std::cmp::Ordering; use rustc_hash::FxHashMap; -use rustpython_ast::ExcepthandlerKind::ExceptHandler; -use rustpython_ast::Stmt; -use rustpython_parser::ast::StmtKind; +use rustpython_parser::ast::ExcepthandlerKind::ExceptHandler; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::RefEquality; diff --git a/crates/ruff/src/ast/cast.rs b/crates/ruff/src/ast/cast.rs index 2d1c210661..8a893bedfb 100644 --- a/crates/ruff/src/ast/cast.rs +++ b/crates/ruff/src/ast/cast.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Expr, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, Stmt, StmtKind}; pub fn name(stmt: &Stmt) -> &str { match &stmt.node { diff --git a/crates/ruff/src/ast/comparable.rs b/crates/ruff/src/ast/comparable.rs index 54d57e5f0f..6d6e6447cf 100644 --- a/crates/ruff/src/ast/comparable.rs +++ b/crates/ruff/src/ast/comparable.rs @@ -2,7 +2,7 @@ //! ability to compare expressions for equality (via [`Eq`] and [`Hash`]). use num_bigint::BigInt; -use rustpython_ast::{ +use rustpython_parser::ast::{ Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Expr, ExprContext, ExprKind, Keyword, Operator, Unaryop, }; diff --git a/crates/ruff/src/ast/function_type.rs b/crates/ruff/src/ast/function_type.rs index 838dac867f..59e988abb9 100644 --- a/crates/ruff/src/ast/function_type.rs +++ b/crates/ruff/src/ast/function_type.rs @@ -1,4 +1,4 @@ -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::helpers::to_call_path; use crate::ast::types::{Scope, ScopeKind}; diff --git a/crates/ruff/src/ast/hashable.rs b/crates/ruff/src/ast/hashable.rs index 71d77e4972..fce13a97db 100644 --- a/crates/ruff/src/ast/hashable.rs +++ b/crates/ruff/src/ast/hashable.rs @@ -1,6 +1,6 @@ use std::hash::Hash; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::comparable::ComparableExpr; diff --git a/crates/ruff/src/ast/helpers.rs b/crates/ruff/src/ast/helpers.rs index a1a126dd7b..6bb7e78e09 100644 --- a/crates/ruff/src/ast/helpers.rs +++ b/crates/ruff/src/ast/helpers.rs @@ -5,7 +5,7 @@ use log::error; use once_cell::sync::Lazy; use regex::Regex; use rustc_hash::{FxHashMap, FxHashSet}; -use rustpython_ast::{ +use rustpython_parser::ast::{ Arguments, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword, KeywordData, Located, Location, Stmt, StmtKind, }; @@ -1138,7 +1138,7 @@ pub fn is_logger_candidate(func: &Expr) -> bool { #[cfg(test)] mod tests { use anyhow::Result; - use rustpython_ast::Location; + use rustpython_parser::ast::Location; use rustpython_parser::parser; use crate::ast::helpers::{ diff --git a/crates/ruff/src/ast/operations.rs b/crates/ruff/src/ast/operations.rs index e024e960b5..213c026470 100644 --- a/crates/ruff/src/ast/operations.rs +++ b/crates/ruff/src/ast/operations.rs @@ -1,7 +1,6 @@ use bitflags::bitflags; use rustc_hash::FxHashMap; -use rustpython_ast::{Cmpop, Located}; -use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Located, Stmt, StmtKind}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; @@ -340,7 +339,7 @@ pub fn locate_cmpops(contents: &str) -> Vec { #[cfg(test)] mod tests { - use rustpython_ast::{Cmpop, Location}; + use rustpython_parser::ast::{Cmpop, Location}; use crate::ast::operations::{locate_cmpops, LocatedCmpop}; diff --git a/crates/ruff/src/ast/types.rs b/crates/ruff/src/ast/types.rs index 571b128075..d4904bce62 100644 --- a/crates/ruff/src/ast/types.rs +++ b/crates/ruff/src/ast/types.rs @@ -2,8 +2,7 @@ use std::ops::Deref; use std::sync::atomic::{AtomicUsize, Ordering}; use rustc_hash::FxHashMap; -use rustpython_ast::{Arguments, Expr, Keyword, Stmt}; -use rustpython_parser::ast::{Located, Location}; +use rustpython_parser::ast::{Arguments, Expr, Keyword, Located, Location, Stmt}; fn id() -> usize { static COUNTER: AtomicUsize = AtomicUsize::new(1); diff --git a/crates/ruff/src/ast/typing.rs b/crates/ruff/src/ast/typing.rs index 184dea8ec1..5d841f55ad 100644 --- a/crates/ruff/src/ast/typing.rs +++ b/crates/ruff/src/ast/typing.rs @@ -1,5 +1,5 @@ use ruff_python::typing::{PEP_585_BUILTINS_ELIGIBLE, PEP_593_SUBSCRIPTS, SUBSCRIPTS}; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::CallPath; diff --git a/crates/ruff/src/ast/whitespace.rs b/crates/ruff/src/ast/whitespace.rs index 5957c908f9..b22c7f67a8 100644 --- a/crates/ruff/src/ast/whitespace.rs +++ b/crates/ruff/src/ast/whitespace.rs @@ -1,6 +1,6 @@ use std::str::Lines; -use rustpython_ast::{Located, Location}; +use rustpython_parser::ast::{Located, Location}; use crate::ast::types::Range; use crate::source_code::Locator; diff --git a/crates/ruff/src/autofix/helpers.rs b/crates/ruff/src/autofix/helpers.rs index 50e8408826..ecae6e33dd 100644 --- a/crates/ruff/src/autofix/helpers.rs +++ b/crates/ruff/src/autofix/helpers.rs @@ -429,7 +429,7 @@ pub fn remove_argument( #[cfg(test)] mod tests { use anyhow::Result; - use rustpython_ast::Location; + use rustpython_parser::ast::Location; use rustpython_parser::parser; use crate::autofix::helpers::{next_stmt_break, trailing_semicolon}; diff --git a/crates/ruff/src/autofix/mod.rs b/crates/ruff/src/autofix/mod.rs index e1edce1f2d..8976c35db1 100644 --- a/crates/ruff/src/autofix/mod.rs +++ b/crates/ruff/src/autofix/mod.rs @@ -1,7 +1,7 @@ use std::collections::BTreeSet; use itertools::Itertools; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::fix::Fix; diff --git a/crates/ruff/src/checkers/ast.rs b/crates/ruff/src/checkers/ast.rs index 4e4d9835ab..7aa9996a46 100644 --- a/crates/ruff/src/checkers/ast.rs +++ b/crates/ruff/src/checkers/ast.rs @@ -9,11 +9,10 @@ use nohash_hasher::IntMap; use ruff_python::builtins::{BUILTINS, MAGIC_GLOBALS}; use ruff_python::typing::TYPING_EXTENSIONS; use rustc_hash::{FxHashMap, FxHashSet}; -use rustpython_ast::{Comprehension, Located, Location}; use rustpython_common::cformat::{CFormatError, CFormatErrorType}; use rustpython_parser::ast::{ - Arg, Arguments, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind, - KeywordData, Operator, Stmt, StmtKind, Suite, + Arg, Arguments, Comprehension, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext, + ExprKind, KeywordData, Located, Location, Operator, Stmt, StmtKind, Suite, }; use rustpython_parser::parser; use smallvec::smallvec; diff --git a/crates/ruff/src/checkers/logical_lines.rs b/crates/ruff/src/checkers/logical_lines.rs index 4e4fe461cc..03117342d0 100644 --- a/crates/ruff/src/checkers/logical_lines.rs +++ b/crates/ruff/src/checkers/logical_lines.rs @@ -1,6 +1,6 @@ use bisection::bisect_left; use itertools::Itertools; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer::LexResult; use crate::ast::types::Range; diff --git a/crates/ruff/src/directives.rs b/crates/ruff/src/directives.rs index c459c8fdac..bdffb62b85 100644 --- a/crates/ruff/src/directives.rs +++ b/crates/ruff/src/directives.rs @@ -2,7 +2,7 @@ use bitflags::bitflags; use nohash_hasher::{IntMap, IntSet}; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer::{LexResult, Tok}; use crate::registry::LintSource; diff --git a/crates/ruff/src/doc_lines.rs b/crates/ruff/src/doc_lines.rs index a691a459fc..b849d33efc 100644 --- a/crates/ruff/src/doc_lines.rs +++ b/crates/ruff/src/doc_lines.rs @@ -1,7 +1,7 @@ //! Doc line extraction. In this context, a doc line is a line consisting of a //! standalone comment or a constant string statement. -use rustpython_ast::{Constant, ExprKind, Stmt, StmtKind, Suite}; +use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind, Suite}; use rustpython_parser::lexer::{LexResult, Tok}; use crate::ast::visitor; diff --git a/crates/ruff/src/docstrings/definition.rs b/crates/ruff/src/docstrings/definition.rs index 62713637cf..a48787bfc7 100644 --- a/crates/ruff/src/docstrings/definition.rs +++ b/crates/ruff/src/docstrings/definition.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Expr, Stmt}; +use rustpython_parser::ast::{Expr, Stmt}; #[derive(Debug, Clone)] pub enum DefinitionKind<'a> { diff --git a/crates/ruff/src/docstrings/extraction.rs b/crates/ruff/src/docstrings/extraction.rs index 56943c32e2..dc814484a0 100644 --- a/crates/ruff/src/docstrings/extraction.rs +++ b/crates/ruff/src/docstrings/extraction.rs @@ -1,6 +1,6 @@ //! Extract docstrings from an AST. -use rustpython_ast::{Constant, Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind}; use crate::docstrings::definition::{Definition, DefinitionKind, Documentable}; use crate::visibility::{Modifier, VisibleScope}; diff --git a/crates/ruff/src/fix.rs b/crates/ruff/src/fix.rs index 0900bf8687..6840b35ee3 100644 --- a/crates/ruff/src/fix.rs +++ b/crates/ruff/src/fix.rs @@ -1,4 +1,4 @@ -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use serde::{Deserialize, Serialize}; #[derive(Debug, Copy, Clone, Hash)] diff --git a/crates/ruff/src/lib_wasm.rs b/crates/ruff/src/lib_wasm.rs index 86d4497b94..d83aa58ed6 100644 --- a/crates/ruff/src/lib_wasm.rs +++ b/crates/ruff/src/lib_wasm.rs @@ -1,6 +1,6 @@ use std::path::Path; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer::LexResult; use serde::Serialize; use wasm_bindgen::prelude::*; diff --git a/crates/ruff/src/rules/eradicate/rules.rs b/crates/ruff/src/rules/eradicate/rules.rs index 3198842483..5331bc731a 100644 --- a/crates/ruff/src/rules/eradicate/rules.rs +++ b/crates/ruff/src/rules/eradicate/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use super::detection::comment_contains_code; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_2020/rules.rs b/crates/ruff/src/rules/flake8_2020/rules.rs index 2eac37d4e6..bbea7ea450 100644 --- a/crates/ruff/src/rules/flake8_2020/rules.rs +++ b/crates/ruff/src/rules/flake8_2020/rules.rs @@ -1,6 +1,6 @@ use num_bigint::BigInt; use ruff_macros::derive_message_formats; -use rustpython_ast::{Cmpop, Constant, Expr, ExprKind, Located}; +use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Located}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_annotations/fixes.rs b/crates/ruff/src/rules/flake8_annotations/fixes.rs index ff9450366e..4fdda610ec 100644 --- a/crates/ruff/src/rules/flake8_annotations/fixes.rs +++ b/crates/ruff/src/rules/flake8_annotations/fixes.rs @@ -1,5 +1,5 @@ use anyhow::{bail, Result}; -use rustpython_ast::Stmt; +use rustpython_parser::ast::Stmt; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/flake8_annotations/helpers.rs b/crates/ruff/src/rules/flake8_annotations/helpers.rs index 5a9738c519..9a13bcc8e2 100644 --- a/crates/ruff/src/rules/flake8_annotations/helpers.rs +++ b/crates/ruff/src/rules/flake8_annotations/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Arguments, Expr, Stmt, StmtKind}; +use rustpython_parser::ast::{Arguments, Expr, Stmt, StmtKind}; use crate::ast::cast; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_annotations/rules.rs b/crates/ruff/src/rules/flake8_annotations/rules.rs index f2799bf21a..86be73897d 100644 --- a/crates/ruff/src/rules/flake8_annotations/rules.rs +++ b/crates/ruff/src/rules/flake8_annotations/rules.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt}; use super::fixes; use super::helpers::match_function_def; diff --git a/crates/ruff/src/rules/flake8_bandit/helpers.rs b/crates/ruff/src/rules/flake8_bandit/helpers.rs index 351cf12645..20dc1b7b51 100644 --- a/crates/ruff/src/rules/flake8_bandit/helpers.rs +++ b/crates/ruff/src/rules/flake8_bandit/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; const PASSWORD_NAMES: [&str; 7] = [ "password", "pass", "passwd", "pwd", "secret", "token", "secrete", diff --git a/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs b/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs index 5b3887e34e..b24c30211b 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Located, StmtKind}; +use rustpython_parser::ast::{Located, StmtKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs b/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs index 0d073f4143..62c8a55a0c 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs @@ -2,7 +2,7 @@ use num_traits::ToPrimitive; use once_cell::sync::Lazy; use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword, Operator}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Operator}; use crate::ast::helpers::{compose_call_path, SimpleCallArgs}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs b/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs index 47fd12c6d6..e836b9d83d 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs index 0256bd398b..ebfd26ce13 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ArgData, Arguments, Expr, Located}; +use rustpython_parser::ast::{ArgData, Arguments, Expr, Located}; use super::super::helpers::{matches_password_name, string_literal}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs index a1ea909f02..8023daad3e 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Keyword; +use rustpython_parser::ast::Keyword; use super::super::helpers::{matches_password_name, string_literal}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs index e851f479c6..cb5322b6ac 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use super::super::helpers::{matches_password_name, string_literal}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs index 689c78e463..8952efa5fc 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs b/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs index d3358c5246..5e67a19ae0 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use super::super::helpers::string_literal; use crate::ast::helpers::SimpleCallArgs; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs b/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs index 8680cd8e4c..b4e9e1dcd8 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; -use rustpython_parser::ast::Constant; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs b/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs index e08e508068..6b86f8d4cd 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword}; +use rustpython_parser::ast::{Expr, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs b/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs index 4e693ee57d..1f032ddf0e 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; -use rustpython_parser::ast::Constant; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs b/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs index 7daf395707..c8a50efacb 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; -use rustpython_parser::ast::Constant; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs b/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs index 1ba3fcaed3..140ae3a009 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs @@ -1,7 +1,6 @@ use num_traits::{One, Zero}; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; -use rustpython_parser::ast::Constant; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs b/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs index bca63f4c7f..660c7be901 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword}; +use rustpython_parser::ast::{Expr, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs b/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs index 173d811974..37ed64de48 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs b/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs index f148214ec9..5734240324 100644 --- a/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs +++ b/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use crate::ast::helpers::SimpleCallArgs; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_blind_except/rules.rs b/crates/ruff/src/rules/flake8_blind_except/rules.rs index 02517d9ae1..149f71777e 100644 --- a/crates/ruff/src/rules/flake8_blind_except/rules.rs +++ b/crates/ruff/src/rules/flake8_blind_except/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind}; use crate::ast::helpers; use crate::ast::helpers::{find_keyword, is_const_true}; diff --git a/crates/ruff/src/rules/flake8_boolean_trap/rules.rs b/crates/ruff/src/rules/flake8_boolean_trap/rules.rs index 5274b12f01..ba21a07a5c 100644 --- a/crates/ruff/src/rules/flake8_boolean_trap/rules.rs +++ b/crates/ruff/src/rules/flake8_boolean_trap/rules.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, ExprKind}; -use rustpython_parser::ast::{Constant, Expr}; +use rustpython_parser::ast::{Arguments, Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs b/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs index 2ec58f58f8..b2dc6908ea 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs b/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs index 3679787108..7f60bf54ad 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind}; use crate::ast::helpers::unparse_stmt; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs b/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs index 4c00417f2c..760959671e 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs @@ -8,7 +8,7 @@ //! custom), use `assertRaisesRegex`, or use the context manager form of //! `assertRaises`. use ruff_macros::derive_message_formats; -use rustpython_ast::{ExprKind, Stmt, Withitem}; +use rustpython_parser::ast::{ExprKind, Stmt, Withitem}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs b/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs index 43e94b6438..0bf869e645 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs b/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs index d2a5b9cd57..e3a77f022e 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::{Range, ScopeKind}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs b/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs index 213b233e38..b528e43cae 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs b/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs index c6ca9ec864..a9f397111b 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs @@ -1,7 +1,9 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; use rustc_hash::{FxHashMap, FxHashSet}; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind, Location}; +use rustpython_parser::ast::{ + Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind, Location, +}; use crate::ast::helpers; use crate::ast::helpers::unparse_expr; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs b/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs index 0d679f417e..559fe1890b 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExprKind, Stmt, StmtKind}; use crate::ast::helpers; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs b/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs index 6f9f0a432f..6b0ca62fdf 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Arguments, Constant, Expr, ExprKind}; use super::mutable_argument_default::is_mutable_func; use crate::ast::helpers::{compose_call_path, to_call_path}; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs b/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs index 54b652240d..6a383a8961 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashSet; -use rustpython_ast::{Comprehension, Expr, ExprContext, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Comprehension, Expr, ExprContext, ExprKind, Stmt, StmtKind}; use crate::ast::helpers::collect_arg_names; use crate::ast::types::{Node, Range}; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs b/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs index 5b73b06e8e..6e3c845454 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs @@ -1,7 +1,7 @@ use ruff_macros::derive_message_formats; use ruff_python::identifiers::{is_identifier, is_mangled_private}; use ruff_python::keyword::KWLIST; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Location}; use crate::ast::helpers::unparse_expr; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs b/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs index 198709473d..b2641b9a36 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs b/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs index 0599fb8387..30e70f1a48 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::ast::visitor; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs b/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs index fa11ea89a7..ac958ae4f7 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, Constant, Expr, ExprKind, Operator}; +use rustpython_parser::ast::{Arguments, Constant, Expr, ExprKind, Operator}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs b/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs index eddbf42094..0d03ab1ad3 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use ruff_python::string::is_lower; -use rustpython_ast::{ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExprKind, Stmt, StmtKind}; use crate::ast::types::Range; use crate::ast::visitor::Visitor; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs b/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs index 443ff47016..3844c87857 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, ExprKind}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, ExprKind}; use crate::ast::helpers::unparse_expr; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs b/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs index 269284c60f..4f23d82d5d 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs @@ -1,7 +1,7 @@ use ruff_macros::derive_message_formats; use ruff_python::identifiers::{is_identifier, is_mangled_private}; use ruff_python::keyword::KWLIST; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind}; use crate::ast::helpers::unparse_stmt; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs b/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs index c41b6fdcdb..88154cacd5 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs @@ -8,7 +8,7 @@ //! mislead readers. use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs b/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs index 168efaec88..3669ddde6b 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs index d176048951..8c682872f0 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs @@ -18,7 +18,7 @@ //! ``` use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Unaryop}; +use rustpython_parser::ast::{Expr, ExprKind, Unaryop}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs index d3cdeca07b..bec2a262a4 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs index bb1670f024..f811e257f0 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs @@ -22,7 +22,7 @@ use std::iter; use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt}; use serde::{Deserialize, Serialize}; use crate::ast::types::{BindingKind, Range, RefEquality}; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs b/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs index 7b47757579..66919dc2bb 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs b/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs index cd9059a846..0f38f57208 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs b/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs index 8a7d0cc28a..1b94163a71 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs b/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs index d610e092fc..346e781223 100644 --- a/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs +++ b/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_builtins/rules.rs b/crates/ruff/src/rules/flake8_builtins/rules.rs index 869b150d78..ff10044afa 100644 --- a/crates/ruff/src/rules/flake8_builtins/rules.rs +++ b/crates/ruff/src/rules/flake8_builtins/rules.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use ruff_python::builtins::BUILTINS; -use rustpython_ast::Located; +use rustpython_parser::ast::Located; use super::types::ShadowingType; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs index 20ec40ddc4..ca34e98b09 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; pub fn function_name(func: &Expr) -> Option<&str> { if let ExprKind::Name { id, .. } = &func.node { diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs index 2d35b36194..700694d3fc 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs index 328caf658d..301d288459 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword}; +use rustpython_parser::ast::{Expr, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs index b540e0c7c4..3b81241bb3 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Comprehension, Expr, ExprKind}; +use rustpython_parser::ast::{Comprehension, Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs index d7c4d5b69e..013d7d2539 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs index 208777e9be..d2544a0b36 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs index a5b7086a86..a3f8b8c497 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs index 9951e72ecb..277312dea4 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs index 57ade20ce5..a52ddf8545 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs index 3046b4a81b..36ea44eddf 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs index 145b09459b..35f6d563ed 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs index ed8de03c3c..6150a6af99 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs index 0883c8ddce..0b0f196a21 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs index 8afce723f8..45dc223a6a 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs index 436fe00719..e1bffcbc7c 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs index 31cfdf3101..30873b2d12 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs index a99007be27..6c784bd5a9 100644 --- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs +++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs @@ -1,6 +1,6 @@ use num_bigint::BigInt; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Unaryop}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Unaryop}; use super::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_datetimez/rules.rs b/crates/ruff/src/rules/flake8_datetimez/rules.rs index 0479f24e7e..8db4b1131e 100644 --- a/crates/ruff/src/rules/flake8_datetimez/rules.rs +++ b/crates/ruff/src/rules/flake8_datetimez/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::helpers::{has_non_none_keyword, is_const_none}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_debugger/rules.rs b/crates/ruff/src/rules/flake8_debugger/rules.rs index 18aad2fb33..6b271a4d76 100644 --- a/crates/ruff/src/rules/flake8_debugger/rules.rs +++ b/crates/ruff/src/rules/flake8_debugger/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Stmt}; +use rustpython_parser::ast::{Expr, Stmt}; use super::types::DebuggerUsingType; use crate::ast::helpers::format_call_path; diff --git a/crates/ruff/src/rules/flake8_errmsg/rules.rs b/crates/ruff/src/rules/flake8_errmsg/rules.rs index a50a00f4ef..2ce2dc7995 100644 --- a/crates/ruff/src/rules/flake8_errmsg/rules.rs +++ b/crates/ruff/src/rules/flake8_errmsg/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs index a651de515d..aa77f44b13 100644 --- a/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs +++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs index 1381c49ac2..5d8bd7d170 100644 --- a/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs +++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs @@ -4,7 +4,7 @@ use std::path::Path; use is_executable::IsExecutable; use ruff_macros::derive_message_formats; #[cfg(not(target_family = "wasm"))] -use rustpython_ast::Location; +use rustpython_parser::ast::Location; #[cfg(not(target_family = "wasm"))] use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs index 8d00053b26..fdd73fa2c5 100644 --- a/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs +++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs index eb7b6ca707..a06ef8ff2a 100644 --- a/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs +++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs b/crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs index 25ee9d0101..b9b9746d4f 100644 --- a/crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs +++ b/crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Operator}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Operator}; use rustpython_parser::lexer::{LexResult, Tok}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_import_conventions/rules.rs b/crates/ruff/src/rules/flake8_import_conventions/rules.rs index 017180707f..59852f2de2 100644 --- a/crates/ruff/src/rules/flake8_import_conventions/rules.rs +++ b/crates/ruff/src/rules/flake8_import_conventions/rules.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::Stmt; +use rustpython_parser::ast::Stmt; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_logging_format/rules.rs b/crates/ruff/src/rules/flake8_logging_format/rules.rs index 55b04409d2..de8db039a9 100644 --- a/crates/ruff/src/rules/flake8_logging_format/rules.rs +++ b/crates/ruff/src/rules/flake8_logging_format/rules.rs @@ -1,5 +1,4 @@ -use rustpython_ast::{Constant, Expr, ExprKind, Keyword, Operator}; -use rustpython_parser::ast::Location; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Location, Operator}; use crate::ast::helpers::{find_keyword, is_logger_candidate, SimpleCallArgs}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_pie/rules.rs b/crates/ruff/src/rules/flake8_pie/rules.rs index 4841167600..40023120df 100644 --- a/crates/ruff/src/rules/flake8_pie/rules.rs +++ b/crates/ruff/src/rules/flake8_pie/rules.rs @@ -3,7 +3,7 @@ use ruff_macros::derive_message_formats; use ruff_python::identifiers::is_identifier; use ruff_python::keyword::KWLIST; use rustc_hash::FxHashSet; -use rustpython_ast::{Boolop, Constant, Expr, ExprKind, Keyword, Stmt, StmtKind}; +use rustpython_parser::ast::{Boolop, Constant, Expr, ExprKind, Keyword, Stmt, StmtKind}; use crate::ast::comparable::ComparableExpr; use crate::ast::helpers::{match_trailing_comment, unparse_expr}; diff --git a/crates/ruff/src/rules/flake8_print/rules/print_call.rs b/crates/ruff/src/rules/flake8_print/rules/print_call.rs index 45cd0a5311..d9e0158b19 100644 --- a/crates/ruff/src/rules/flake8_print/rules/print_call.rs +++ b/crates/ruff/src/rules/flake8_print/rules/print_call.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, Keyword, Stmt, StmtKind}; use crate::ast::helpers::is_const_none; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs index 589a5e96ea..fb7bc3de07 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ +use rustpython_parser::ast::{ Boolop, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword, Stmt, StmtKind, Unaryop, }; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs index 6136bcc493..5d91a7e7b0 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword}; +use rustpython_parser::ast::{Expr, Keyword}; use super::helpers::{is_empty_or_null_string, is_pytest_fail}; use crate::ast::helpers::SimpleCallArgs; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs index f6ada1a8ac..6d9f5809ed 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs @@ -1,7 +1,7 @@ use anyhow::Result; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, Expr, ExprKind, Keyword, Location, Stmt, StmtKind}; +use rustpython_parser::ast::{Arguments, Expr, ExprKind, Keyword, Location, Stmt, StmtKind}; use super::helpers::{ get_mark_decorators, get_mark_name, is_abstractmethod_decorator, is_pytest_fixture, diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs index df0ad876a2..e303125f77 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs @@ -1,5 +1,5 @@ use num_traits::identities::Zero; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::helpers::collect_call_path; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs index ff47eab298..f92e85af08 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Stmt; +use rustpython_parser::ast::Stmt; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs index 8438a627df..bca6a9a90a 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Location}; +use rustpython_parser::ast::{Expr, ExprKind, Location}; use super::helpers::{get_mark_decorators, get_mark_name}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs index d4ef6e7e5d..116ac7adec 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind}; use super::super::types; use super::helpers::{is_pytest_parametrize, split_names}; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs index ceffcc4a46..a66c5f8b29 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashSet; -use rustpython_ast::{Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword}; use crate::ast::helpers::{collect_arg_names, compose_call_path, SimpleCallArgs}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs index 8231d81ae7..e2ae8f074c 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword, Stmt, StmtKind, Withitem}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword, Stmt, StmtKind, Withitem}; use super::helpers::is_empty_or_null_string; use crate::ast::helpers::{format_call_path, to_call_path}; diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs index c72ce38a80..068fb69872 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs @@ -2,7 +2,7 @@ use std::hash::BuildHasherDefault; use anyhow::{anyhow, bail, Result}; use rustc_hash::FxHashMap; -use rustpython_ast::{ +use rustpython_parser::ast::{ Cmpop, Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind, Unaryop, }; diff --git a/crates/ruff/src/rules/flake8_quotes/rules.rs b/crates/ruff/src/rules/flake8_quotes/rules.rs index b437ba99fe..a049c41df0 100644 --- a/crates/ruff/src/rules/flake8_quotes/rules.rs +++ b/crates/ruff/src/rules/flake8_quotes/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer::{LexResult, Tok}; use super::settings::Quote; diff --git a/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs b/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs index b09d5f3fb3..b7eebed4d0 100644 --- a/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs +++ b/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::helpers::match_parens; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_return/helpers.rs b/crates/ruff/src/rules/flake8_return/helpers.rs index 484c23f686..23e60c2002 100644 --- a/crates/ruff/src/rules/flake8_return/helpers.rs +++ b/crates/ruff/src/rules/flake8_return/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Constant, Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt}; /// Return `true` if a function's return statement include at least one /// non-`None` value. diff --git a/crates/ruff/src/rules/flake8_return/rules.rs b/crates/ruff/src/rules/flake8_return/rules.rs index 026e3395e5..ff75e0a608 100644 --- a/crates/ruff/src/rules/flake8_return/rules.rs +++ b/crates/ruff/src/rules/flake8_return/rules.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Location, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Location, Stmt, StmtKind}; use super::branch::Branch; use super::helpers::result_exists; diff --git a/crates/ruff/src/rules/flake8_return/visitor.rs b/crates/ruff/src/rules/flake8_return/visitor.rs index 4e58d06547..002244025d 100644 --- a/crates/ruff/src/rules/flake8_return/visitor.rs +++ b/crates/ruff/src/rules/flake8_return/visitor.rs @@ -1,5 +1,5 @@ use rustc_hash::{FxHashMap, FxHashSet}; -use rustpython_ast::{Expr, ExprKind, Location, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, ExprKind, Location, Stmt, StmtKind}; use crate::ast::visitor; use crate::ast::visitor::Visitor; diff --git a/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs b/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs index d093af5ee2..68731cb9a2 100644 --- a/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs +++ b/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs index ba2595bd77..9b83c234bc 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs @@ -3,7 +3,7 @@ use std::iter; use itertools::Either::{Left, Right}; use ruff_macros::derive_message_formats; -use rustpython_ast::{Boolop, Cmpop, Constant, Expr, ExprContext, ExprKind, Unaryop}; +use rustpython_parser::ast::{Boolop, Cmpop, Constant, Expr, ExprContext, ExprKind, Unaryop}; use crate::ast::helpers::{contains_effect, create_expr, has_comments, unparse_expr}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs index 2607a5eaf8..a133fc02d8 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::helpers::{create_expr, unparse_expr}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_for.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_for.rs index 287af7f7c2..2205c2ac55 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_for.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_for.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ +use rustpython_parser::ast::{ Comprehension, Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind, Unaryop, }; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs index eb7862ba4f..1c116465a7 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Cmpop, Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind}; use crate::ast::comparable::ComparableExpr; use crate::ast::helpers::{ diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs index cf909029a2..c3b353e439 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Unaryop}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Unaryop}; use crate::ast::helpers::{create_expr, unparse_expr}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs index 29d8efc5f4..82d52d12d7 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Cmpop, Expr, ExprKind, Stmt, StmtKind, Unaryop}; +use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Stmt, StmtKind, Unaryop}; use crate::ast::helpers::{create_expr, unparse_expr}; use crate::ast::types::{Range, ScopeKind}; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs index ebfd748c6c..0ab46109f0 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Located, Stmt, StmtKind, Withitem}; +use rustpython_parser::ast::{Located, Stmt, StmtKind, Withitem}; use super::fix_with; use crate::ast::helpers::{first_colon_range, has_comments_in}; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs b/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs index d17da52c08..1a5eb62953 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs @@ -4,7 +4,7 @@ use libcst_native::{ LeftParen, ParenthesizableWhitespace, ParenthesizedNode, RightParen, SimpleWhitespace, Statement, Suite, }; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::ast::whitespace; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs b/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs index 7cac2d512c..34dbb4f367 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Result}; use libcst_native::{Codegen, CodegenState, CompoundStatement, Statement, Suite, With}; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::ast::whitespace; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs b/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs index 266c5c7f5f..d85a746c1b 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Cmpop, Expr, ExprKind}; +use rustpython_parser::ast::{Cmpop, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs b/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs index 2c425ae411..5aab410f3e 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; -use rustpython_parser::ast::StmtKind; +use rustpython_parser::ast::{Expr, ExprKind, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs b/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs index 9389b98c72..3a6b5fc19e 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/use_contextlib_suppress.rs b/crates/ruff/src/rules/flake8_simplify/rules/use_contextlib_suppress.rs index f34e41bfda..b5f9688ad4 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/use_contextlib_suppress.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/use_contextlib_suppress.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Located, Stmt, StmtKind}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Located, Stmt, StmtKind}; use crate::ast::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs b/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs index 025c7fe63e..04fe9b99c4 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs @@ -2,7 +2,7 @@ use anyhow::Result; use libcst_native::{Codegen, CodegenState, CompOp}; use ruff_macros::derive_message_formats; use ruff_python::string::{self}; -use rustpython_ast::{Cmpop, Expr, ExprKind}; +use rustpython_parser::ast::{Cmpop, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs b/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs index f76facc6c2..cf8f12e0cb 100644 --- a/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs +++ b/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Alias, Expr, Located}; +use rustpython_parser::ast::{Alias, Expr, Located}; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs b/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs index 6459d49735..8ef9427483 100644 --- a/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs +++ b/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Stmt; +use rustpython_parser::ast::Stmt; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/crates/ruff/src/rules/flake8_type_checking/helpers.rs b/crates/ruff/src/rules/flake8_type_checking/helpers.rs index c75eea0127..93d93557c8 100644 --- a/crates/ruff/src/rules/flake8_type_checking/helpers.rs +++ b/crates/ruff/src/rules/flake8_type_checking/helpers.rs @@ -1,5 +1,5 @@ use num_traits::Zero; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::types::{Binding, BindingKind, ExecutionContext}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs b/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs index e249fbd26b..2fb69be707 100644 --- a/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs +++ b/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::{Range, RefEquality}; use crate::autofix::helpers::delete_stmt; diff --git a/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs b/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs index 2437305a4d..41da06cc85 100644 --- a/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs +++ b/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Constant, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind}; use crate::ast::helpers::is_docstring_stmt; diff --git a/crates/ruff/src/rules/flake8_unused_arguments/rules.rs b/crates/ruff/src/rules/flake8_unused_arguments/rules.rs index 2b469bd00a..9c36b9df51 100644 --- a/crates/ruff/src/rules/flake8_unused_arguments/rules.rs +++ b/crates/ruff/src/rules/flake8_unused_arguments/rules.rs @@ -3,7 +3,7 @@ use std::iter; use regex::Regex; use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Arg, Arguments}; +use rustpython_parser::ast::{Arg, Arguments}; use super::helpers; use super::types::Argumentable; diff --git a/crates/ruff/src/rules/flake8_use_pathlib/helpers.rs b/crates/ruff/src/rules/flake8_use_pathlib/helpers.rs index 122c1ec20f..d671f5e45c 100644 --- a/crates/ruff/src/rules/flake8_use_pathlib/helpers.rs +++ b/crates/ruff/src/rules/flake8_use_pathlib/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/isort/annotate.rs b/crates/ruff/src/rules/isort/annotate.rs index 43f1ba0331..60045f9ad7 100644 --- a/crates/ruff/src/rules/isort/annotate.rs +++ b/crates/ruff/src/rules/isort/annotate.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use super::comments::Comment; use super::helpers::trailing_comma; diff --git a/crates/ruff/src/rules/isort/comments.rs b/crates/ruff/src/rules/isort/comments.rs index 46fa02a36d..6b24d83b85 100644 --- a/crates/ruff/src/rules/isort/comments.rs +++ b/crates/ruff/src/rules/isort/comments.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/isort/helpers.rs b/crates/ruff/src/rules/isort/helpers.rs index e2c1cb372d..1159e0321c 100644 --- a/crates/ruff/src/rules/isort/helpers.rs +++ b/crates/ruff/src/rules/isort/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Location, Stmt}; +use rustpython_parser::ast::{Location, Stmt}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; @@ -124,7 +124,7 @@ pub fn find_splice_location(body: &[Stmt], locator: &Locator) -> Location { #[cfg(test)] mod tests { use anyhow::Result; - use rustpython_ast::Location; + use rustpython_parser::ast::Location; use rustpython_parser::parser; use super::find_splice_location; diff --git a/crates/ruff/src/rules/isort/rules/add_required_imports.rs b/crates/ruff/src/rules/isort/rules/add_required_imports.rs index 5ce2516e5a..b3894e9f09 100644 --- a/crates/ruff/src/rules/isort/rules/add_required_imports.rs +++ b/crates/ruff/src/rules/isort/rules/add_required_imports.rs @@ -2,7 +2,7 @@ use std::fmt; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Location, StmtKind, Suite}; +use rustpython_parser::ast::{Location, StmtKind, Suite}; use super::super::helpers; use super::super::track::Block; diff --git a/crates/ruff/src/rules/isort/rules/organize_imports.rs b/crates/ruff/src/rules/isort/rules/organize_imports.rs index 28cbb214b4..e9d197ab15 100644 --- a/crates/ruff/src/rules/isort/rules/organize_imports.rs +++ b/crates/ruff/src/rules/isort/rules/organize_imports.rs @@ -2,7 +2,7 @@ use std::path::Path; use itertools::{EitherOrBoth, Itertools}; use ruff_macros::derive_message_formats; -use rustpython_ast::{Location, Stmt}; +use rustpython_parser::ast::{Location, Stmt}; use textwrap::indent; use super::super::track::Block; diff --git a/crates/ruff/src/rules/isort/track.rs b/crates/ruff/src/rules/isort/track.rs index cf820ff723..1633c29d2b 100644 --- a/crates/ruff/src/rules/isort/track.rs +++ b/crates/ruff/src/rules/isort/track.rs @@ -1,6 +1,6 @@ use std::path::Path; -use rustpython_ast::{ +use rustpython_parser::ast::{ Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext, Keyword, MatchCase, Operator, Pattern, Stmt, StmtKind, Unaryop, Withitem, diff --git a/crates/ruff/src/rules/mccabe/rules.rs b/crates/ruff/src/rules/mccabe/rules.rs index 61c99af921..8cbb8d69f8 100644 --- a/crates/ruff/src/rules/mccabe/rules.rs +++ b/crates/ruff/src/rules/mccabe/rules.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExcepthandlerKind, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExcepthandlerKind, ExprKind, Stmt, StmtKind}; use crate::ast::helpers::identifier_range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pandas_vet/fixes.rs b/crates/ruff/src/rules/pandas_vet/fixes.rs index 5e58779dd0..941147f421 100644 --- a/crates/ruff/src/rules/pandas_vet/fixes.rs +++ b/crates/ruff/src/rules/pandas_vet/fixes.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Expr, ExprKind, Keyword, Location}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword, Location}; use crate::ast::helpers; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pandas_vet/helpers.rs b/crates/ruff/src/rules/pandas_vet/helpers.rs index cde99d802a..d9e72ce72b 100644 --- a/crates/ruff/src/rules/pandas_vet/helpers.rs +++ b/crates/ruff/src/rules/pandas_vet/helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; /// Return `true` if an `Expr` _could_ be a `DataFrame`. This rules out /// obviously-wrong cases, like constants and literals. diff --git a/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs b/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs index ed689d03fb..6be3adbb68 100644 --- a/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs +++ b/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs b/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs index 32b88ab378..2263fba94a 100644 --- a/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs +++ b/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExprKind, Located}; +use rustpython_parser::ast::{ExprKind, Located}; use crate::ast::types::{BindingKind, Range}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pandas_vet/rules/check_call.rs b/crates/ruff/src/rules/pandas_vet/rules/check_call.rs index eb8b1a4473..52228a78fb 100644 --- a/crates/ruff/src/rules/pandas_vet/rules/check_call.rs +++ b/crates/ruff/src/rules/pandas_vet/rules/check_call.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExprKind, Located}; +use rustpython_parser::ast::{ExprKind, Located}; use crate::ast::types::{BindingKind, Range}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs b/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs index 6f54a9e3d0..0224765a44 100644 --- a/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs +++ b/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs b/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs index e20748f403..1a50bd05fe 100644 --- a/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs +++ b/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pep8_naming/helpers.rs b/crates/ruff/src/rules/pep8_naming/helpers.rs index 872dedfd57..0850bcb403 100644 --- a/crates/ruff/src/rules/pep8_naming/helpers.rs +++ b/crates/ruff/src/rules/pep8_naming/helpers.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_python::string::{is_lower, is_upper}; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pep8_naming/rules.rs b/crates/ruff/src/rules/pep8_naming/rules.rs index d6926e6c3f..5455c01006 100644 --- a/crates/ruff/src/rules/pep8_naming/rules.rs +++ b/crates/ruff/src/rules/pep8_naming/rules.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use ruff_python::string::{self}; -use rustpython_ast::{Arg, Arguments, Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Arg, Arguments, Expr, ExprKind, Stmt}; use super::helpers; use crate::ast::function_type; diff --git a/crates/ruff/src/rules/pycodestyle/logical_lines.rs b/crates/ruff/src/rules/pycodestyle/logical_lines.rs index 1d798e9b14..daeb99985e 100644 --- a/crates/ruff/src/rules/pycodestyle/logical_lines.rs +++ b/crates/ruff/src/rules/pycodestyle/logical_lines.rs @@ -1,4 +1,4 @@ -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer::{LexResult, Tok}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pycodestyle/rules/do_not_assign_lambda.rs b/crates/ruff/src/rules/pycodestyle/rules/do_not_assign_lambda.rs index 1fa4744046..58e39d10b5 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/do_not_assign_lambda.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/do_not_assign_lambda.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, Location, Stmt, StmtKind}; -use rustpython_parser::ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Arguments, Expr, ExprKind, Location, Stmt, StmtKind}; use crate::ast::helpers::{match_leading_content, match_trailing_content, unparse_stmt}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pycodestyle/rules/do_not_use_bare_except.rs b/crates/ruff/src/rules/pycodestyle/rules/do_not_use_bare_except.rs index 2af6423515..9c9583aee2 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/do_not_use_bare_except.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/do_not_use_bare_except.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, Stmt, StmtKind}; -use rustpython_parser::ast::Expr; +use rustpython_parser::ast::{Excepthandler, Expr, Stmt, StmtKind}; use crate::ast::helpers::except_range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs b/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs index 1ac468d42f..4aff1aca93 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pycodestyle/rules/imports.rs b/crates/ruff/src/rules/pycodestyle/rules/imports.rs index 88a0a2f883..1a9753f46f 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/imports.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/imports.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Alias, Stmt}; +use rustpython_parser::ast::{Alias, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs b/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs index 04ebf43f6b..5b47d1c1c0 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs b/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs index 369a217eda..75cc8f2f33 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs b/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs index 4e405c8290..d0fac87815 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs @@ -1,8 +1,7 @@ use itertools::izip; use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::Constant; -use rustpython_parser::ast::{Cmpop, Expr, ExprKind}; +use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind}; use serde::{Deserialize, Serialize}; use crate::ast::helpers; diff --git a/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs b/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs index 1ddcc06c54..5cff5e7180 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::ast::whitespace::leading_space; diff --git a/crates/ruff/src/rules/pycodestyle/rules/no_newline_at_end_of_file.rs b/crates/ruff/src/rules/pycodestyle/rules/no_newline_at_end_of_file.rs index 74626be2e7..aeedf7aba9 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/no_newline_at_end_of_file.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/no_newline_at_end_of_file.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs b/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs index afd0991f0d..91feca28ec 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Unaryop; -use rustpython_parser::ast::{Cmpop, Expr, ExprKind}; +use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Unaryop}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs b/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs index 497dffa7a4..ee52162b10 100644 --- a/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs +++ b/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs @@ -1,7 +1,6 @@ use itertools::izip; use ruff_macros::derive_message_formats; -use rustpython_ast::Constant; -use rustpython_parser::ast::{Cmpop, Expr, ExprKind}; +use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs b/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs index 68fa4d6d18..38b8a376ac 100644 --- a/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs +++ b/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::StmtKind; +use rustpython_parser::ast::StmtKind; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pydocstyle/rules/sections.rs b/crates/ruff/src/rules/pydocstyle/rules/sections.rs index b4b123ddc6..a21b62a018 100644 --- a/crates/ruff/src/rules/pydocstyle/rules/sections.rs +++ b/crates/ruff/src/rules/pydocstyle/rules/sections.rs @@ -3,7 +3,7 @@ use once_cell::sync::Lazy; use regex::Regex; use ruff_macros::derive_message_formats; use rustc_hash::FxHashSet; -use rustpython_ast::StmtKind; +use rustpython_parser::ast::StmtKind; use crate::ast::types::Range; use crate::ast::whitespace::LinesWithTrailingNewline; diff --git a/crates/ruff/src/rules/pyflakes/fixes.rs b/crates/ruff/src/rules/pyflakes/fixes.rs index 2b9926be6e..6a4ac21118 100644 --- a/crates/ruff/src/rules/pyflakes/fixes.rs +++ b/crates/ruff/src/rules/pyflakes/fixes.rs @@ -1,7 +1,7 @@ use anyhow::{bail, Result}; use libcst_native::{Call, Codegen, CodegenState, Dict, DictElement, Expression}; use ruff_python::string::strip_quotes_and_prefixes; -use rustpython_ast::{Excepthandler, Expr}; +use rustpython_parser::ast::{Excepthandler, Expr}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs b/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs index c65a896e08..20e68a5334 100644 --- a/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs +++ b/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs b/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs index ec4c1221c4..254fc9e7d9 100644 --- a/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs +++ b/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs b/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs index e516d043ba..507470f123 100644 --- a/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs +++ b/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs b/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs index 8b944b11d1..5c2bd5b99d 100644 --- a/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs +++ b/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind}; use crate::ast::helpers::except_range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs b/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs index 7e17c47f8d..213c67d94b 100644 --- a/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs +++ b/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::helpers::find_useless_f_strings; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs b/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs index 79702381b8..5009cea24e 100644 --- a/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs +++ b/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/imports.rs b/crates/ruff/src/rules/pyflakes/rules/imports.rs index 69d6724e70..01bb1b38c6 100644 --- a/crates/ruff/src/rules/pyflakes/rules/imports.rs +++ b/crates/ruff/src/rules/pyflakes/rules/imports.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; use ruff_python::future::ALL_FEATURE_NAMES; -use rustpython_ast::Alias; +use rustpython_parser::ast::Alias; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs b/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs index 9f4e0715ce..3ff7c7ad8e 100644 --- a/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs +++ b/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs @@ -2,7 +2,7 @@ use itertools::izip; use log::error; use once_cell::unsync::Lazy; use ruff_macros::derive_message_formats; -use rustpython_ast::{Cmpop, Expr}; +use rustpython_parser::ast::{Cmpop, Expr}; use serde::{Deserialize, Serialize}; use crate::ast::helpers; diff --git a/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs b/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs index 3633100e11..6de9a8f579 100644 --- a/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs +++ b/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs b/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs index d59daf167c..20ced39ef5 100644 --- a/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs +++ b/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs b/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs index 1dc16d630b..4d9b62d231 100644 --- a/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs +++ b/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs @@ -2,7 +2,7 @@ use std::hash::{BuildHasherDefault, Hash}; use ruff_macros::derive_message_formats; use rustc_hash::{FxHashMap, FxHashSet}; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::comparable::{ComparableConstant, ComparableExpr}; use crate::ast::helpers::unparse_expr; diff --git a/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs b/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs index 3cdf658e2a..3b88127866 100644 --- a/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs +++ b/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Stmt; +use rustpython_parser::ast::Stmt; use crate::ast::types::{Range, ScopeKind}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyflakes/rules/strings.rs b/crates/ruff/src/rules/pyflakes/rules/strings.rs index d3e4cb0a0a..096be534c4 100644 --- a/crates/ruff/src/rules/pyflakes/rules/strings.rs +++ b/crates/ruff/src/rules/pyflakes/rules/strings.rs @@ -3,8 +3,7 @@ use std::string::ToString; use log::error; use ruff_macros::derive_message_formats; use rustc_hash::FxHashSet; -use rustpython_ast::{Keyword, KeywordData}; -use rustpython_parser::ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, KeywordData}; use super::super::cformat::CFormatSummary; use super::super::fixes::{ diff --git a/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs b/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs index 027b4589fd..9412c0c0fd 100644 --- a/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs +++ b/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{ExprKind, Location, Stmt, StmtKind}; +use rustpython_parser::ast::{ExprKind, Location, Stmt, StmtKind}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs b/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs index 217f550945..812b4b5933 100644 --- a/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs +++ b/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs @@ -1,7 +1,7 @@ use std::fmt; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use serde::{Deserialize, Serialize}; use crate::ast::types::{Range, ScopeKind}; diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs index 2b43f88ee4..4861c86c25 100644 --- a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs +++ b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs @@ -1,7 +1,7 @@ use once_cell::sync::Lazy; use regex::Regex; use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs index d5e3575a08..3562e51599 100644 --- a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs +++ b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs @@ -1,7 +1,7 @@ use once_cell::sync::Lazy; use regex::Regex; use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs b/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs index 7d7a5ccfec..ec845f15d1 100644 --- a/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs +++ b/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs b/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs index 0e4d151951..224c0a8f85 100644 --- a/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs +++ b/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/await_outside_async.rs b/crates/ruff/src/rules/pylint/rules/await_outside_async.rs index bbcecef2f9..9bc2de451b 100644 --- a/crates/ruff/src/rules/pylint/rules/await_outside_async.rs +++ b/crates/ruff/src/rules/pylint/rules/await_outside_async.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::{FunctionDef, Range, ScopeKind}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs b/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs index 73654ab4a7..2ccad1bb75 100644 --- a/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs +++ b/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs @@ -2,7 +2,7 @@ use std::fmt; use ruff_macros::derive_message_formats; use rustc_hash::FxHashSet; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use serde::{Deserialize, Serialize}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs b/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs index ad7cfffc80..16f4141400 100644 --- a/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs +++ b/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs b/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs index 35d92fd830..551a3fa918 100644 --- a/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs +++ b/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs @@ -2,7 +2,7 @@ use std::fmt; use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Cmpop, Expr, ExprKind, Located}; +use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Located}; use serde::{Deserialize, Serialize}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pylint/rules/consider_using_sys_exit.rs b/crates/ruff/src/rules/pylint/rules/consider_using_sys_exit.rs index c751482297..fd212a22d1 100644 --- a/crates/ruff/src/rules/pylint/rules/consider_using_sys_exit.rs +++ b/crates/ruff/src/rules/pylint/rules/consider_using_sys_exit.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::{BindingKind, Range}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs b/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs index e942adad35..fd4fde650e 100644 --- a/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs +++ b/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs b/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs index 5425b78f80..b5b0f2e694 100644 --- a/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs +++ b/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs b/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs index 131f953af2..d6b494c217 100644 --- a/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs +++ b/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/merge_isinstance.rs b/crates/ruff/src/rules/pylint/rules/merge_isinstance.rs index 07a459a755..73f857e7a4 100644 --- a/crates/ruff/src/rules/pylint/rules/merge_isinstance.rs +++ b/crates/ruff/src/rules/pylint/rules/merge_isinstance.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; use rustc_hash::{FxHashMap, FxHashSet}; -use rustpython_ast::{Boolop, Expr, ExprKind}; +use rustpython_parser::ast::{Boolop, Expr, ExprKind}; use crate::ast::hashable::HashableExpr; use crate::ast::helpers::unparse_expr; diff --git a/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs b/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs index 526e5e24a5..377b446d84 100644 --- a/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs +++ b/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Arguments, Expr, ExprKind, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs b/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs index 9304569067..9408c21a82 100644 --- a/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs +++ b/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Arguments, Stmt}; +use rustpython_parser::ast::{Arguments, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/too_many_branches.rs b/crates/ruff/src/rules/pylint/rules/too_many_branches.rs index 9edf953aec..0e30107e63 100644 --- a/crates/ruff/src/rules/pylint/rules/too_many_branches.rs +++ b/crates/ruff/src/rules/pylint/rules/too_many_branches.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExcepthandlerKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExcepthandlerKind, Stmt, StmtKind}; use crate::ast::helpers::identifier_range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs b/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs index f37947d3e2..e827c3521f 100644 --- a/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs +++ b/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Stmt; +use rustpython_parser::ast::Stmt; use crate::ast::helpers::{identifier_range, ReturnStatementVisitor}; use crate::ast::visitor::Visitor; diff --git a/crates/ruff/src/rules/pylint/rules/too_many_statements.rs b/crates/ruff/src/rules/pylint/rules/too_many_statements.rs index 13178e428a..fda612c11f 100644 --- a/crates/ruff/src/rules/pylint/rules/too_many_statements.rs +++ b/crates/ruff/src/rules/pylint/rules/too_many_statements.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExcepthandlerKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExcepthandlerKind, Stmt, StmtKind}; use crate::ast::helpers::identifier_range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs b/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs index d76f864e0c..96bc49c2bf 100644 --- a/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs +++ b/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/use_from_import.rs b/crates/ruff/src/rules/pylint/rules/use_from_import.rs index a6c3610932..234e136ea0 100644 --- a/crates/ruff/src/rules/pylint/rules/use_from_import.rs +++ b/crates/ruff/src/rules/pylint/rules/use_from_import.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Alias; -use rustpython_parser::ast::Stmt; +use rustpython_parser::ast::{Alias, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/used_prior_global_declaration.rs b/crates/ruff/src/rules/pylint/rules/used_prior_global_declaration.rs index 4d3f891232..063f1cb153 100644 --- a/crates/ruff/src/rules/pylint/rules/used_prior_global_declaration.rs +++ b/crates/ruff/src/rules/pylint/rules/used_prior_global_declaration.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::{Range, ScopeKind}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs b/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs index 322ffee0fc..a33f44daef 100644 --- a/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs +++ b/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExcepthandlerKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExcepthandlerKind, Stmt, StmtKind}; use crate::ast::helpers; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs b/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs index e0a5007603..adfd9eb9bd 100644 --- a/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs +++ b/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Alias; +use rustpython_parser::ast::Alias; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pylint/settings.rs b/crates/ruff/src/rules/pylint/settings.rs index 879a680507..1aa8027ba9 100644 --- a/crates/ruff/src/rules/pylint/settings.rs +++ b/crates/ruff/src/rules/pylint/settings.rs @@ -4,7 +4,7 @@ use std::hash::Hash; use anyhow::anyhow; use ruff_macros::ConfigurationOptions; -use rustpython_ast::Constant; +use rustpython_parser::ast::Constant; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)] diff --git a/crates/ruff/src/rules/pyupgrade/fixes.rs b/crates/ruff/src/rules/pyupgrade/fixes.rs index dc2ed8eb38..59163fe9ab 100644 --- a/crates/ruff/src/rules/pyupgrade/fixes.rs +++ b/crates/ruff/src/rules/pyupgrade/fixes.rs @@ -3,7 +3,7 @@ use libcst_native::{ Codegen, CodegenState, CompoundStatement, Expression, ParenthesizableWhitespace, SmallStatement, Statement, Suite, }; -use rustpython_ast::{Expr, Keyword, Location}; +use rustpython_parser::ast::{Expr, Keyword, Location}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs b/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs index 6c2c13f587..c2029de134 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs @@ -3,7 +3,7 @@ use log::debug; use ruff_macros::derive_message_formats; use ruff_python::identifiers::is_identifier; use ruff_python::keyword::KWLIST; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind}; use crate::ast::helpers::{create_expr, create_stmt, unparse_stmt}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs b/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs index 3693f44665..c0544a4328 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs @@ -3,7 +3,7 @@ use log::debug; use ruff_macros::derive_message_formats; use ruff_python::identifiers::is_identifier; use ruff_python::keyword::KWLIST; -use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind}; +use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind}; use crate::ast::helpers::{create_expr, create_stmt, unparse_stmt}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs index 088d0d6a87..fe9ec418cf 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::helpers::collect_call_path; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs index fafcb00223..925d311c1c 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs @@ -1,7 +1,7 @@ use once_cell::sync::Lazy; use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs b/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs index d4a9d13d49..3e23d64788 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs @@ -1,9 +1,9 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Constant, Expr, ExprKind, KeywordData}; use rustpython_common::format::{ FieldName, FieldNamePart, FieldType, FormatPart, FormatString, FromTemplate, }; +use rustpython_parser::ast::{Constant, Expr, ExprKind, KeywordData}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs b/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs index f759c3f795..c189bf413d 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs @@ -3,7 +3,7 @@ use libcst_native::{Arg, Codegen, CodegenState, Expression}; use once_cell::sync::Lazy; use regex::Regex; use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/functools_cache.rs b/crates/ruff/src/rules/pyupgrade/rules/functools_cache.rs index 19faf0584d..c120bf8fa8 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/functools_cache.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/functools_cache.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, ExprKind, KeywordData}; -use rustpython_parser::ast::Expr; +use rustpython_parser::ast::{Constant, Expr, ExprKind, KeywordData}; use crate::ast::helpers::{create_expr, unparse_expr}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/import_replacements.rs b/crates/ruff/src/rules/pyupgrade/rules/import_replacements.rs index 080286c796..93cfb9a0d4 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/import_replacements.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/import_replacements.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Alias, AliasData, Stmt}; +use rustpython_parser::ast::{Alias, AliasData, Stmt}; use crate::ast::types::Range; use crate::ast::whitespace::indentation; diff --git a/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs b/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs index 3cac1aa8d6..b1fa898fed 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs @@ -1,6 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::ExprKind; -use rustpython_parser::ast::Expr; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::helpers::unparse_expr; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs b/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs index 47a9072623..c2045a5c91 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs @@ -1,7 +1,7 @@ use std::fmt; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; use serde::{Deserialize, Serialize}; diff --git a/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs index 887c8a0edc..72cd98537e 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs index 96ef10a15c..47ae86a426 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Located}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Located}; use crate::ast::helpers::compose_call_path; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs b/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs index fdd1b3948c..8a45acee3f 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs @@ -3,8 +3,7 @@ use std::cmp::Ordering; use log::error; use num_bigint::{BigInt, Sign}; use ruff_macros::derive_message_formats; -use rustpython_ast::Location; -use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Located, Stmt}; +use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Located, Location, Stmt}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs b/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs index 0f897916e7..787d43b819 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs @@ -3,11 +3,10 @@ use std::str::FromStr; use ruff_macros::derive_message_formats; use ruff_python::identifiers::is_identifier; use ruff_python::keyword::KWLIST; -use rustpython_ast::Location; use rustpython_common::cformat::{ CConversionFlags, CFormatPart, CFormatPrecision, CFormatQuantity, CFormatString, }; -use rustpython_parser::ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Location}; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs b/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs index 87d3cb2833..33fe29383d 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs @@ -3,7 +3,7 @@ use std::str::FromStr; use anyhow::{anyhow, Result}; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword, Location}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Location}; use rustpython_parser::lexer; use rustpython_parser::token::Tok; diff --git a/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs b/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs index bc9a8446bb..b86465f57b 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword}; +use rustpython_parser::ast::{Expr, Keyword}; use crate::ast::helpers::find_keyword; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs b/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs index 0b7953b44a..cf595d2276 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Keyword, Location}; +use rustpython_parser::ast::{Expr, Keyword, Location}; use crate::ast::helpers::find_keyword; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/rewrite_c_element_tree.rs b/crates/ruff/src/rules/pyupgrade/rules/rewrite_c_element_tree.rs index 2cfbc8ca40..3e24984eb5 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/rewrite_c_element_tree.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/rewrite_c_element_tree.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Located, Stmt, StmtKind}; +use rustpython_parser::ast::{Located, Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/rewrite_mock_import.rs b/crates/ruff/src/rules/pyupgrade/rules/rewrite_mock_import.rs index 0444ed35e1..ca9c26524e 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/rewrite_mock_import.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/rewrite_mock_import.rs @@ -5,7 +5,7 @@ use libcst_native::{ }; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind}; use serde::{Deserialize, Serialize}; use crate::ast::helpers::collect_call_path; diff --git a/crates/ruff/src/rules/pyupgrade/rules/rewrite_unicode_literal.rs b/crates/ruff/src/rules/pyupgrade/rules/rewrite_unicode_literal.rs index 4409b6ab01..584f365eb2 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/rewrite_unicode_literal.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/rewrite_unicode_literal.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, Location}; +use rustpython_parser::ast::{Expr, Location}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/rewrite_yield_from.rs b/crates/ruff/src/rules/pyupgrade/rules/rewrite_yield_from.rs index e45dc0024b..a4a8cd3c58 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/rewrite_yield_from.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/rewrite_yield_from.rs @@ -1,6 +1,6 @@ use ruff_macros::derive_message_formats; use rustc_hash::FxHashMap; -use rustpython_ast::{Expr, ExprContext, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, ExprContext, ExprKind, Stmt, StmtKind}; use crate::ast::types::{Range, RefEquality}; use crate::ast::visitor; diff --git a/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs b/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs index 187786f7a9..6a32382fbe 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ArgData, Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ArgData, Expr, ExprKind, Stmt, StmtKind}; use crate::ast::types::{Range, ScopeKind}; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs b/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs index b1e03e414e..75876e7bca 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use super::super::types::Primitive; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs index 877996b844..9ce2950d04 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs index f045459fbe..95d9824b54 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs @@ -1,8 +1,7 @@ use itertools::Itertools; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Alias, AliasData, Located}; -use rustpython_parser::ast::Stmt; +use rustpython_parser::ast::{Alias, AliasData, Located, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs index 2e42d293ff..90d0e3a89d 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs @@ -1,7 +1,7 @@ use once_cell::sync::Lazy; use regex::Regex; use ruff_macros::derive_message_formats; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs index 8321eaec64..5a6f4b0b4a 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Keyword}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs index 810a429790..5522b98235 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs @@ -1,8 +1,7 @@ use itertools::Itertools; use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Alias, AliasData, Located}; -use rustpython_parser::ast::Stmt; +use rustpython_parser::ast::{Alias, AliasData, Located, Stmt}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/unpack_list_comprehension.rs b/crates/ruff/src/rules/pyupgrade/rules/unpack_list_comprehension.rs index 761f2cb81e..9a6d340102 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/unpack_list_comprehension.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/unpack_list_comprehension.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind}; +use rustpython_parser::ast::{Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs index e3a3656922..1bca9fd6de 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs index 9c730663ba..2b7ec77423 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind, Location, Operator}; +use rustpython_parser::ast::{Constant, Expr, ExprKind, Location, Operator}; use crate::ast::helpers::unparse_expr; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs b/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs index 72a25fef0f..d7914a9d80 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs @@ -1,6 +1,6 @@ use log::error; use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Stmt}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt}; use crate::ast::types::Range; use crate::autofix::helpers; diff --git a/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs b/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs index 7e4e3f1b6d..789e82e0e4 100644 --- a/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs +++ b/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword, Stmt}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword, Stmt}; use super::super::fixes; use crate::ast::types::{Binding, BindingKind, Range, Scope}; diff --git a/crates/ruff/src/rules/pyupgrade/types.rs b/crates/ruff/src/rules/pyupgrade/types.rs index 73ebcd30c6..b94c983f21 100644 --- a/crates/ruff/src/rules/pyupgrade/types.rs +++ b/crates/ruff/src/rules/pyupgrade/types.rs @@ -1,4 +1,4 @@ -use rustpython_ast::Constant; +use rustpython_parser::ast::Constant; use serde::{Deserialize, Serialize}; #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)] diff --git a/crates/ruff/src/rules/ruff/rules/keyword_argument_before_star_argument.rs b/crates/ruff/src/rules/ruff/rules/keyword_argument_before_star_argument.rs index e5d65e0a6c..42bce06e3e 100644 --- a/crates/ruff/src/rules/ruff/rules/keyword_argument_before_star_argument.rs +++ b/crates/ruff/src/rules/ruff/rules/keyword_argument_before_star_argument.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Keyword, KeywordData}; +use rustpython_parser::ast::{Expr, ExprKind, Keyword, KeywordData}; use crate::ast::types::Range; use crate::define_violation; diff --git a/crates/ruff/src/rules/ruff/rules/unpack_instead_of_concatenating_to_collection_literal.rs b/crates/ruff/src/rules/ruff/rules/unpack_instead_of_concatenating_to_collection_literal.rs index 68be8f7d99..1096d9da76 100644 --- a/crates/ruff/src/rules/ruff/rules/unpack_instead_of_concatenating_to_collection_literal.rs +++ b/crates/ruff/src/rules/ruff/rules/unpack_instead_of_concatenating_to_collection_literal.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprContext, ExprKind, Operator}; +use rustpython_parser::ast::{Expr, ExprContext, ExprKind, Operator}; use crate::ast::helpers::{create_expr, has_comments, unparse_expr}; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs b/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs index fd070c199e..474fabcd4e 100644 --- a/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs +++ b/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind}; use crate::ast::helpers::is_logger_candidate; use crate::ast::types::Range; diff --git a/crates/ruff/src/rules/tryceratops/rules/prefer_type_error.rs b/crates/ruff/src/rules/tryceratops/rules/prefer_type_error.rs index bcf1ceb88b..006501bd9f 100644 --- a/crates/ruff/src/rules/tryceratops/rules/prefer_type_error.rs +++ b/crates/ruff/src/rules/tryceratops/rules/prefer_type_error.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind}; use crate::ast::types::Range; use crate::ast::visitor; diff --git a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs index 6e47f67df1..cf5a033b6c 100644 --- a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs +++ b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Constant, Expr, ExprKind}; +use rustpython_parser::ast::{Constant, Expr, ExprKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs index d36d2d9c30..a2e2c2e81f 100644 --- a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs +++ b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::Expr; +use rustpython_parser::ast::Expr; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs b/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs index a7581d0a77..315ef5863c 100644 --- a/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs +++ b/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::Range; use crate::ast::visitor::{self, Visitor}; diff --git a/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs b/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs index 178642f0eb..59e656ac6a 100644 --- a/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs +++ b/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{ExprKind, Stmt, StmtKind}; use crate::ast::types::Range; use crate::ast::visitor::{self, Visitor}; diff --git a/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs b/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs index 0e7fdb6045..ad56a613ab 100644 --- a/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs +++ b/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Stmt, StmtKind}; +use rustpython_parser::ast::{Stmt, StmtKind}; use crate::ast::types::Range; use crate::checkers::ast::Checker; diff --git a/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs b/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs index 6133db714d..a5d43f94de 100644 --- a/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs +++ b/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs @@ -1,5 +1,5 @@ use ruff_macros::derive_message_formats; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Stmt, StmtKind}; +use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Stmt, StmtKind}; use crate::ast::types::Range; use crate::ast::visitor; diff --git a/crates/ruff/src/rustpython_helpers.rs b/crates/ruff/src/rustpython_helpers.rs index 07e36a6206..eb498f7ebc 100644 --- a/crates/ruff/src/rustpython_helpers.rs +++ b/crates/ruff/src/rustpython_helpers.rs @@ -1,4 +1,4 @@ -use rustpython_ast::{Mod, Suite}; +use rustpython_parser::ast::{Mod, Suite}; use rustpython_parser::error::ParseError; use rustpython_parser::lexer::LexResult; use rustpython_parser::mode::Mode; diff --git a/crates/ruff/src/source_code/generator.rs b/crates/ruff/src/source_code/generator.rs index d92bb4f72b..8b45ab0d75 100644 --- a/crates/ruff/src/source_code/generator.rs +++ b/crates/ruff/src/source_code/generator.rs @@ -2,10 +2,9 @@ use std::ops::Deref; -use rustpython_ast::{Excepthandler, ExcepthandlerKind, Suite, Withitem}; use rustpython_parser::ast::{ - Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, ConversionFlag, Expr, ExprKind, - Operator, Stmt, StmtKind, + Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, ConversionFlag, Excepthandler, + ExcepthandlerKind, Expr, ExprKind, Operator, Stmt, StmtKind, Suite, Withitem, }; use crate::source_code::stylist::{Indentation, LineEnding, Quote, Stylist}; diff --git a/crates/ruff/src/source_code/indexer.rs b/crates/ruff/src/source_code/indexer.rs index 6c805d7dc7..5a789f2d66 100644 --- a/crates/ruff/src/source_code/indexer.rs +++ b/crates/ruff/src/source_code/indexer.rs @@ -1,7 +1,7 @@ //! Struct used to index source code, to enable efficient lookup of tokens that //! are omitted from the AST (e.g., commented lines). -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer::{LexResult, Tok}; pub struct Indexer { diff --git a/crates/ruff/src/source_code/locator.rs b/crates/ruff/src/source_code/locator.rs index cfa430eae6..17b2722877 100644 --- a/crates/ruff/src/source_code/locator.rs +++ b/crates/ruff/src/source_code/locator.rs @@ -1,7 +1,7 @@ //! Struct used to efficiently slice source code at (row, column) Locations. use once_cell::unsync::OnceCell; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use crate::ast::types::Range; @@ -151,7 +151,7 @@ impl<'a> Locator<'a> { #[cfg(test)] mod tests { - use rustpython_ast::Location; + use rustpython_parser::ast::Location; use crate::source_code::locator::{index_ascii, index_utf8, truncate_ascii, truncate_utf8}; diff --git a/crates/ruff/src/source_code/stylist.rs b/crates/ruff/src/source_code/stylist.rs index d4f7438d61..b4b6c20604 100644 --- a/crates/ruff/src/source_code/stylist.rs +++ b/crates/ruff/src/source_code/stylist.rs @@ -4,7 +4,7 @@ use std::fmt; use std::ops::Deref; use once_cell::unsync::OnceCell; -use rustpython_ast::Location; +use rustpython_parser::ast::Location; use rustpython_parser::lexer; use rustpython_parser::lexer::Tok; diff --git a/crates/ruff/src/visibility.rs b/crates/ruff/src/visibility.rs index 23423b1754..70b24a4f50 100644 --- a/crates/ruff/src/visibility.rs +++ b/crates/ruff/src/visibility.rs @@ -3,7 +3,7 @@ use std::path::Path; -use rustpython_ast::{Expr, Stmt, StmtKind}; +use rustpython_parser::ast::{Expr, Stmt, StmtKind}; use crate::ast::helpers::collect_call_path; use crate::checkers::ast::Checker;