Remove less used parser dependencies

astral-sh · Jun 3, 2024 · 599ca90 · 599ca90
1 parent f4e23d2
commit 599ca90
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ruff_python_parser/Cargo.toml b/crates/ruff_python_parser/Cargo.toml
@@ -17,11 +17,8 @@ ruff_python_ast = { workspace = true }
 ruff_python_trivia = { workspace = true }
 ruff_text_size = { workspace = true }
 
-anyhow = { workspace = true }
 bitflags = { workspace = true }
 bstr = { workspace = true }
-is-macro = { workspace = true }
-itertools = { workspace = true }
 memchr = { workspace = true }
 rustc-hash = { workspace = true }
 static_assertions = { workspace = true }
@@ -33,6 +30,7 @@ unicode-normalization = { workspace = true }
 ruff_source_file = { workspace = true }
 
 annotate-snippets = { workspace = true }
+anyhow = { workspace = true }
 insta = { workspace = true, features = ["glob"] }
 walkdir = { workspace = true }
 

diff --git a/crates/ruff_python_parser/src/lexer.rs b/crates/ruff_python_parser/src/lexer.rs
@@ -6,16 +6,17 @@
 //!
 //! [Lexical analysis]: https://docs.python.org/3/reference/lexical_analysis.html
 
-use std::{char, cmp::Ordering, str::FromStr};
+use std::cmp::Ordering;
+use std::str::FromStr;
 
 use bitflags::bitflags;
+use unicode_ident::{is_xid_continue, is_xid_start};
+use unicode_normalization::UnicodeNormalization;
+
 use ruff_python_ast::str::Quote;
 use ruff_python_ast::str_prefix::{
     AnyStringPrefix, ByteStringPrefix, FStringPrefix, StringLiteralPrefix,
 };
-use unicode_ident::{is_xid_continue, is_xid_start};
-use unicode_normalization::UnicodeNormalization;
-
 use ruff_python_ast::{AnyStringFlags, Int, IpyEscapeKind, StringFlags};
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 

diff --git a/crates/ruff_python_parser/src/lib.rs b/crates/ruff_python_parser/src/lib.rs
@@ -73,7 +73,6 @@ pub use crate::token::TokenKind;
 
 use crate::parser::Parser;
 
-use itertools::Itertools;
 use ruff_python_ast::{Expr, Mod, ModExpression, ModModule, PySourceType, Suite};
 use ruff_python_trivia::CommentRanges;
 use ruff_text_size::{Ranged, TextRange, TextSize};
@@ -388,9 +387,8 @@ impl Tokens {
         let end = *self.first_unknown_or_len.get_or_init(|| {
             self.raw
                 .iter()
-                .find_position(|token| token.kind() == TokenKind::Unknown)
-                .map(|(idx, _)| idx)
-                .unwrap_or_else(|| self.raw.len())
+                .position(|token| token.kind() == TokenKind::Unknown)
+                .unwrap_or(self.raw.len())
         });
         &self.raw[..end]
     }

diff --git a/crates/ruff_python_parser/src/typing.rs b/crates/ruff_python_parser/src/typing.rs
@@ -1,15 +1,13 @@
 //! This module takes care of parsing a type annotation.
 
-use anyhow::Result;
-
 use ruff_python_ast::relocate::relocate_expr;
 use ruff_python_ast::str::raw_contents;
 use ruff_python_ast::{Expr, ExprStringLiteral, StringFlags, StringLiteral};
 use ruff_text_size::Ranged;
 
-use crate::{parse_expression, parse_expression_range};
+use crate::{parse_expression, parse_expression_range, ParseError};
 
-#[derive(is_macro::Is, Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug)]
 pub enum AnnotationKind {
     /// The annotation is defined as part a simple string literal,
     /// e.g. `x: "List[int]" = []`. Annotations within simple literals
@@ -24,12 +22,19 @@ pub enum AnnotationKind {
     Complex,
 }
 
+impl AnnotationKind {
+    /// Returns `true` if the annotation kind is simple.
+    pub const fn is_simple(self) -> bool {
+        matches!(self, AnnotationKind::Simple)
+    }
+}
+
 /// Parses the given string expression node as a type annotation. The given `source` is the entire
 /// source code.
 pub fn parse_type_annotation(
     string_expr: &ExprStringLiteral,
     source: &str,
-) -> Result<(Expr, AnnotationKind)> {
+) -> Result<(Expr, AnnotationKind), ParseError> {
     let expr_text = &source[string_expr.range()];
 
     if let [string_literal] = string_expr.value.as_slice() {
@@ -53,7 +58,7 @@ pub fn parse_type_annotation(
 fn parse_simple_type_annotation(
     string_literal: &StringLiteral,
     source: &str,
-) -> Result<(Expr, AnnotationKind)> {
+) -> Result<(Expr, AnnotationKind), ParseError> {
     Ok((
         parse_expression_range(
             source,
@@ -69,7 +74,7 @@ fn parse_simple_type_annotation(
 
 fn parse_complex_type_annotation(
     string_expr: &ExprStringLiteral,
-) -> Result<(Expr, AnnotationKind)> {
+) -> Result<(Expr, AnnotationKind), ParseError> {
     let mut parsed = parse_expression(string_expr.value.to_str())?.into_expr();
     relocate_expr(&mut parsed, string_expr.range());
     Ok((parsed, AnnotationKind::Complex))