Move Token, TokenKind and Tokens to ruff-python-ast (#21760)
This commit is contained in:
@@ -4,6 +4,7 @@ use bitflags::bitflags;
|
||||
use rustc_hash::{FxBuildHasher, FxHashSet};
|
||||
|
||||
use ruff_python_ast::name::Name;
|
||||
use ruff_python_ast::token::TokenKind;
|
||||
use ruff_python_ast::{
|
||||
self as ast, AnyStringFlags, AtomicNodeIndex, BoolOp, CmpOp, ConversionFlag, Expr, ExprContext,
|
||||
FString, InterpolatedStringElement, InterpolatedStringElements, IpyEscapeKind, Number,
|
||||
@@ -18,7 +19,7 @@ use crate::string::{
|
||||
InterpolatedStringKind, StringType, parse_interpolated_string_literal_element,
|
||||
parse_string_literal,
|
||||
};
|
||||
use crate::token::{TokenKind, TokenValue};
|
||||
use crate::token::TokenValue;
|
||||
use crate::token_set::TokenSet;
|
||||
use crate::{
|
||||
InterpolatedStringErrorType, Mode, ParseErrorType, UnsupportedSyntaxError,
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
use ruff_python_ast::token::TokenKind;
|
||||
use ruff_python_ast::{self as ast, CmpOp, Expr, ExprContext, Number};
|
||||
use ruff_text_size::{Ranged, TextRange};
|
||||
|
||||
use crate::{TokenKind, error::RelaxedDecoratorError};
|
||||
use crate::error::RelaxedDecoratorError;
|
||||
|
||||
/// Set the `ctx` for `Expr::Id`, `Expr::Attribute`, `Expr::Subscript`, `Expr::Starred`,
|
||||
/// `Expr::Tuple` and `Expr::List`. If `expr` is either `Expr::Tuple` or `Expr::List`,
|
||||
|
||||
@@ -2,6 +2,7 @@ use std::cmp::Ordering;
|
||||
|
||||
use bitflags::bitflags;
|
||||
|
||||
use ruff_python_ast::token::TokenKind;
|
||||
use ruff_python_ast::{AtomicNodeIndex, Mod, ModExpression, ModModule};
|
||||
use ruff_text_size::{Ranged, TextRange, TextSize};
|
||||
|
||||
@@ -12,7 +13,7 @@ use crate::string::InterpolatedStringKind;
|
||||
use crate::token::TokenValue;
|
||||
use crate::token_set::TokenSet;
|
||||
use crate::token_source::{TokenSource, TokenSourceCheckpoint};
|
||||
use crate::{Mode, ParseError, ParseErrorType, TokenKind, UnsupportedSyntaxErrorKind};
|
||||
use crate::{Mode, ParseError, ParseErrorType, UnsupportedSyntaxErrorKind};
|
||||
use crate::{Parsed, Tokens};
|
||||
|
||||
pub use crate::parser::options::ParseOptions;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use ruff_python_ast::name::Name;
|
||||
use ruff_python_ast::token::TokenKind;
|
||||
use ruff_python_ast::{
|
||||
self as ast, AtomicNodeIndex, Expr, ExprContext, Number, Operator, Pattern, Singleton,
|
||||
};
|
||||
@@ -7,7 +8,7 @@ use ruff_text_size::{Ranged, TextSize};
|
||||
use crate::ParseErrorType;
|
||||
use crate::parser::progress::ParserProgress;
|
||||
use crate::parser::{Parser, RecoveryContextKind, SequenceMatchPatternParentheses, recovery};
|
||||
use crate::token::{TokenKind, TokenValue};
|
||||
use crate::token::TokenValue;
|
||||
use crate::token_set::TokenSet;
|
||||
|
||||
use super::expression::ExpressionContext;
|
||||
|
||||
@@ -2,6 +2,7 @@ use compact_str::CompactString;
|
||||
use std::fmt::{Display, Write};
|
||||
|
||||
use ruff_python_ast::name::Name;
|
||||
use ruff_python_ast::token::TokenKind;
|
||||
use ruff_python_ast::{
|
||||
self as ast, AtomicNodeIndex, ExceptHandler, Expr, ExprContext, IpyEscapeKind, Operator,
|
||||
PythonVersion, Stmt, WithItem,
|
||||
@@ -14,7 +15,7 @@ use crate::parser::progress::ParserProgress;
|
||||
use crate::parser::{
|
||||
FunctionKind, Parser, RecoveryContext, RecoveryContextKind, WithItemKind, helpers,
|
||||
};
|
||||
use crate::token::{TokenKind, TokenValue};
|
||||
use crate::token::TokenValue;
|
||||
use crate::token_set::TokenSet;
|
||||
use crate::{Mode, ParseErrorType, UnsupportedSyntaxErrorKind};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user