Skip to content

Commit 515de2d

Browse files
authored
Move Token, TokenKind and Tokens to ruff-python-ast (#21760)
1 parent 508c0a0 commit 515de2d

File tree

80 files changed

+1484
-1492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1484
-1492
lines changed

crates/ruff_benchmark/benches/lexer.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use criterion::{
66
use ruff_benchmark::{
77
LARGE_DATASET, NUMPY_CTYPESLIB, NUMPY_GLOBALS, PYDANTIC_TYPES, TestCase, UNICODE_PYPINYIN,
88
};
9-
use ruff_python_parser::{Mode, TokenKind, lexer};
9+
use ruff_python_ast::token::TokenKind;
10+
use ruff_python_parser::{Mode, lexer};
1011

1112
#[cfg(target_os = "windows")]
1213
#[global_allocator]

crates/ruff_linter/src/checkers/ast/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to
3535
use ruff_python_ast::identifier::Identifier;
3636
use ruff_python_ast::name::QualifiedName;
3737
use ruff_python_ast::str::Quote;
38+
use ruff_python_ast::token::Tokens;
3839
use ruff_python_ast::visitor::{Visitor, walk_except_handler, walk_pattern};
3940
use ruff_python_ast::{
4041
self as ast, AnyParameterRef, ArgOrKeyword, Comprehension, ElifElseClause, ExceptHandler, Expr,
@@ -48,7 +49,7 @@ use ruff_python_parser::semantic_errors::{
4849
SemanticSyntaxChecker, SemanticSyntaxContext, SemanticSyntaxError, SemanticSyntaxErrorKind,
4950
};
5051
use ruff_python_parser::typing::{AnnotationKind, ParsedAnnotation, parse_type_annotation};
51-
use ruff_python_parser::{ParseError, Parsed, Tokens};
52+
use ruff_python_parser::{ParseError, Parsed};
5253
use ruff_python_semantic::all::{DunderAllDefinition, DunderAllFlags};
5354
use ruff_python_semantic::analyze::{imports, typing};
5455
use ruff_python_semantic::{

crates/ruff_linter/src/checkers/logical_lines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use ruff_python_ast::token::{TokenKind, Tokens};
12
use ruff_python_codegen::Stylist;
23
use ruff_python_index::Indexer;
3-
use ruff_python_parser::{TokenKind, Tokens};
44
use ruff_source_file::LineRanges;
55
use ruff_text_size::{Ranged, TextRange};
66

crates/ruff_linter/src/checkers/tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use std::path::Path;
44

55
use ruff_notebook::CellOffsets;
66
use ruff_python_ast::PySourceType;
7+
use ruff_python_ast::token::Tokens;
78
use ruff_python_codegen::Stylist;
89
use ruff_python_index::Indexer;
9-
use ruff_python_parser::Tokens;
1010

1111
use crate::Locator;
1212
use crate::directives::TodoComment;

crates/ruff_linter/src/directives.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use std::str::FromStr;
55

66
use bitflags::bitflags;
77

8+
use ruff_python_ast::token::{TokenKind, Tokens};
89
use ruff_python_index::Indexer;
9-
use ruff_python_parser::{TokenKind, Tokens};
1010
use ruff_python_trivia::CommentRanges;
1111
use ruff_source_file::LineRanges;
1212
use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};

crates/ruff_linter/src/doc_lines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use std::iter::FusedIterator;
55
use std::slice::Iter;
66

77
use ruff_python_ast::statement_visitor::{StatementVisitor, walk_stmt};
8+
use ruff_python_ast::token::{Token, TokenKind, Tokens};
89
use ruff_python_ast::{self as ast, Stmt, Suite};
9-
use ruff_python_parser::{Token, TokenKind, Tokens};
1010
use ruff_source_file::UniversalNewlineIterator;
1111
use ruff_text_size::{Ranged, TextSize};
1212

crates/ruff_linter/src/importer/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ use anyhow::Result;
99
use libcst_native as cst;
1010

1111
use ruff_diagnostics::Edit;
12+
use ruff_python_ast::token::Tokens;
1213
use ruff_python_ast::{self as ast, Expr, ModModule, Stmt};
1314
use ruff_python_codegen::Stylist;
1415
use ruff_python_importer::Insertion;
15-
use ruff_python_parser::{Parsed, Tokens};
16+
use ruff_python_parser::Parsed;
1617
use ruff_python_semantic::{
1718
ImportedName, MemberNameImport, ModuleNameImport, NameImport, SemanticModel,
1819
};

crates/ruff_linter/src/rules/flake8_commas/rules/trailing_commas.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use ruff_macros::{ViolationMetadata, derive_message_formats};
2+
use ruff_python_ast::token::{TokenKind, Tokens};
23
use ruff_python_index::Indexer;
3-
use ruff_python_parser::{TokenKind, Tokens};
44
use ruff_text_size::{Ranged, TextRange};
55

66
use crate::Locator;

crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use ruff_python_ast as ast;
33
use ruff_python_ast::ExprGenerator;
44
use ruff_python_ast::comparable::ComparableExpr;
55
use ruff_python_ast::parenthesize::parenthesized_range;
6-
use ruff_python_parser::TokenKind;
6+
use ruff_python_ast::token::TokenKind;
77
use ruff_text_size::{Ranged, TextRange, TextSize};
88

99
use crate::checkers::ast::Checker;

crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use ruff_python_ast as ast;
33
use ruff_python_ast::ExprGenerator;
44
use ruff_python_ast::comparable::ComparableExpr;
55
use ruff_python_ast::parenthesize::parenthesized_range;
6-
use ruff_python_parser::TokenKind;
6+
use ruff_python_ast::token::TokenKind;
77
use ruff_text_size::{Ranged, TextRange, TextSize};
88

99
use crate::checkers::ast::Checker;

0 commit comments

Comments
 (0)