Merge pull request #17 from youknowone/ruff

ruff integration support

Author: youknowone

.github/workflows/ci.yaml

@@ -37,6 +37,8 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
+      - name: run tests with default features
+        run: cargo test --all
       - name: run tests with embedded parser
         run: cargo test --all --no-default-features
       - name: run tests with generated parser

Cargo.toml

@@ -16,11 +16,9 @@ members = [
 ]
 
 [workspace.dependencies]
-rustpython-ast = { path = "ast", version = "0.2.0" }
-rustpython-parser-core = { path = "core", version = "0.2.0" }
+rustpython-ast = { path = "ast", version = "0.2.0", default-features = false }
+rustpython-parser-core = { path = "core", version = "0.2.0", default-features = false }
 rustpython-literal = { path = "literal", version = "0.2.0" }
-ruff_text_size = { path = "ruff_text_size" }
-ruff_source_location = { path = "ruff_source_location" }
 
 ahash = "0.7.6"
 anyhow = "1.0.45"

ast/Cargo.toml

@@ -8,9 +8,9 @@ repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
 
 [features]
-default = ["constant-optimization", "fold", "source-code"]
+default = ["location"]
 constant-optimization = ["fold"]
-source-code = ["fold"]
+location = ["fold", "rustpython-parser-core/location"]
 fold = []
 unparse = ["rustpython-literal"]
 visitor = []

ast/src/builtin.rs

@@ -13,16 +13,33 @@ impl Identifier {
     pub fn new(s: impl Into<String>) -> Self {
         Self(s.into())
     }
+}
+
+impl std::cmp::PartialEq<str> for Identifier {
     #[inline]
-    pub fn as_str(&self) -> &str {
-        self.0.as_str()
+    fn eq(&self, other: &str) -> bool {
+        self.0 == other
     }
 }
 
-impl std::string::ToString for Identifier {
+impl std::cmp::PartialEq<String> for Identifier {
     #[inline]
-    fn to_string(&self) -> String {
-        self.0.clone()
+    fn eq(&self, other: &String) -> bool {
+        &self.0 == other
+    }
+}
+
+impl std::ops::Deref for Identifier {
+    type Target = String;
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl std::fmt::Display for Identifier {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
     }
 }
 
@@ -33,24 +50,46 @@ impl From<Identifier> for String {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+impl From<String> for Identifier {
+    #[inline]
+    fn from(id: String) -> Self {
+        Self(id)
+    }
+}
+
+impl<'a> From<&'a str> for Identifier {
+    #[inline]
+    fn from(id: &'a str) -> Identifier {
+        id.to_owned().into()
+    }
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Int(u32);
 
 impl Int {
     pub fn new(i: u32) -> Self {
         Self(i)
     }
-    pub fn new_bool(i: bool) -> Self {
-        Self(i as u32)
-    }
     pub fn to_u32(&self) -> u32 {
         self.0
     }
     pub fn to_usize(&self) -> usize {
         self.0 as _
     }
-    pub fn to_bool(&self) -> bool {
-        self.0 > 0
+}
+
+impl std::cmp::PartialEq<u32> for Int {
+    #[inline]
+    fn eq(&self, other: &u32) -> bool {
+        self.0 == *other
+    }
+}
+
+impl std::cmp::PartialEq<usize> for Int {
+    #[inline]
+    fn eq(&self, other: &usize) -> bool {
+        self.0 as usize == *other
     }
 }
 
@@ -165,11 +204,11 @@ impl<T, U> Attributed<T, U> {
 
 impl<T> Attributed<T, ()> {
     /// Creates a new node that spans the position specified by `range`.
-    pub fn new(range: impl Into<TextRange>, node: T) -> Self {
+    pub fn new(range: impl Into<TextRange>, node: impl Into<T>) -> Self {
         Self {
             range: range.into(),
             custom: (),
-            node,
+            node: node.into(),
         }
     }
 

ast/src/lib.rs

@@ -8,7 +8,7 @@ mod generic {
     include!("gen/generic.rs");
 }
 mod impls;
-#[cfg(feature = "source-code")]
+#[cfg(feature = "location")]
 mod source_locator;
 #[cfg(feature = "unparse")]
 mod unparse;
@@ -32,11 +32,12 @@ mod visitor {
     include!("gen/visitor.rs");
 }
 
-#[cfg(feature = "source-code")]
+#[cfg(feature = "location")]
 pub mod located {
     include!("gen/located.rs");
 }
 
+#[cfg(feature = "location")]
 pub use rustpython_parser_core::source_code;
 #[cfg(feature = "visitor")]
 pub use visitor::Visitor;

core/Cargo.toml

@@ -20,5 +20,5 @@ serde = { version = "1.0.133", optional = true, default-features = false, featur
 lz4_flex = "0.9.2"
 
 [features]
-default = ["source-code"]
-source-code = ["ruff_source_location"]
+default = []
+location = ["ruff_source_location"]

core/src/lib.rs

@@ -4,7 +4,7 @@
 mod error;
 mod format;
 pub mod mode;
-#[cfg(feature = "source-code")]
+#[cfg(feature = "location")]
 pub mod source_code;
 
 pub use error::BaseError;

literal/src/escape.rs

@@ -1,4 +1,4 @@
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum Quote {
     Single,
     Double,
@@ -80,15 +80,21 @@ pub struct UnicodeEscape<'a> {
 }
 
 impl<'a> UnicodeEscape<'a> {
+    #[inline]
     pub fn with_forced_quote(source: &'a str, quote: Quote) -> Self {
         let layout = EscapeLayout { quote, len: None };
         Self { source, layout }
     }
-    pub fn new_repr(source: &'a str) -> Self {
-        let layout = Self::repr_layout(source, Quote::Single);
+    #[inline]
+    pub fn with_preferred_quote(source: &'a str, quote: Quote) -> Self {
+        let layout = Self::repr_layout(source, quote);
         Self { source, layout }
     }
-
+    #[inline]
+    pub fn new_repr(source: &'a str) -> Self {
+        Self::with_preferred_quote(source, Quote::Single)
+    }
+    #[inline]
     pub fn str_repr<'r>(&'a self) -> StrRepr<'r, 'a> {
         StrRepr(self)
     }
@@ -265,18 +271,25 @@ pub struct AsciiEscape<'a> {
 }
 
 impl<'a> AsciiEscape<'a> {
+    #[inline]
     pub fn new(source: &'a [u8], layout: EscapeLayout) -> Self {
         Self { source, layout }
     }
+    #[inline]
     pub fn with_forced_quote(source: &'a [u8], quote: Quote) -> Self {
         let layout = EscapeLayout { quote, len: None };
         Self { source, layout }
     }
-    pub fn new_repr(source: &'a [u8]) -> Self {
-        let layout = Self::repr_layout(source, Quote::Single);
+    #[inline]
+    pub fn with_preferred_quote(source: &'a [u8], quote: Quote) -> Self {
+        let layout = Self::repr_layout(source, quote);
         Self { source, layout }
     }
-
+    #[inline]
+    pub fn new_repr(source: &'a [u8]) -> Self {
+        Self::with_preferred_quote(source, Quote::Single)
+    }
+    #[inline]
     pub fn bytes_repr<'r>(&'a self) -> BytesRepr<'r, 'a> {
         BytesRepr(self)
     }

parser/Cargo.toml

@@ -9,7 +9,8 @@ license = "MIT"
 edition = "2021"
 
 [features]
-default = []
+default = ["location"]
+location = ["rustpython-ast/location"]
 serde = ["dep:serde", "rustpython-parser-core/serde"]
 
 [build-dependencies]

parser/src/lib.rs

@@ -113,7 +113,9 @@
 #![doc(html_root_url = "https://docs.rs/rustpython-parser/")]
 
 pub use rustpython_ast as ast;
-pub use rustpython_parser_core::{source_code, text_size, Mode};
+#[cfg(feature = "location")]
+pub use rustpython_parser_core::source_code;
+pub use rustpython_parser_core::{text_size, Mode};
 
 mod function;
 // Skip flattening lexer to distinguish from full parser