vendor text_size and source_location (#102)

Author: youknowone

Cargo.toml

@@ -11,12 +11,12 @@ include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 [workspace]
 resolver = "2"
 members = [
-    "ast", "core", "format", "literal", "parser",
+    "ast", "core", "format", "literal", "parser", "vendored",
     "ast-pyo3",
-    "ruff_text_size", "ruff_source_location",
 ]
 
 [workspace.dependencies]
+rustpython-parser-vendored = { path = "vendored" }
 rustpython-ast = { path = "ast", default-features = false }
 rustpython-parser-core = { path = "core", features = [] }
 rustpython-literal = { path = "literal" }

core/Cargo.toml

@@ -8,14 +8,12 @@ repository = "https://github.com/RustPython/Parser/"
 license = "MIT"
 
 [dependencies]
-# ruff dependency shouldn't be placed out of this crate
-ruff_text_size = { path = "../ruff_text_size" }
-ruff_source_location = { path = "../ruff_source_location", optional = true }
-
+# vendored dependency shouldn't be placed out of this crate
+rustpython-parser-vendored.workspace = true
 serde = { version = "1.0.133", optional = true, default-features = false, features = ["derive"] }
 is-macro.workspace = true
 memchr.workspace = true
 
 [features]
 default = []
-location = ["dep:ruff_source_location"]
+location = []

core/src/lib.rs

@@ -11,5 +11,6 @@ pub use error::BaseError;
 pub use format::ConversionFlag;
 pub use mode::Mode;
 
-// re-export our public interface
-pub use ruff_text_size as text_size;
+#[cfg(feature = "location")]
+pub use rustpython_parser_vendored::source_location;
+pub use rustpython_parser_vendored::text_size;

core/src/source_code.rs

@@ -2,7 +2,7 @@
 use crate::text_size::{TextLen, TextSize};
 use memchr::memrchr2;
 
-pub use ruff_source_location::{
+pub use crate::source_location::{
     newlines::{find_newline, UniversalNewlineIterator},
     LineIndex, OneIndexed, SourceCode, SourceLocation,
 };

literal/src/escape.rs

@@ -155,8 +155,15 @@ impl UnicodeEscape<'_> {
             };
             let Some(new_len) = length_add(out_len, incr) else {
                 #[cold]
-                fn stop(single_count: usize, double_count: usize, preferred_quote: Quote) -> EscapeLayout {
-                    EscapeLayout { quote: choose_quote(single_count, double_count, preferred_quote).0, len: None }
+                fn stop(
+                    single_count: usize,
+                    double_count: usize,
+                    preferred_quote: Quote,
+                ) -> EscapeLayout {
+                    EscapeLayout {
+                        quote: choose_quote(single_count, double_count, preferred_quote).0,
+                        len: None,
+                    }
                 }
                 return stop(single_count, double_count, preferred_quote);
             };
@@ -332,8 +339,15 @@ impl AsciiEscape<'_> {
             };
             let Some(new_len) = length_add(out_len, incr) else {
                 #[cold]
-                fn stop(single_count: usize, double_count: usize, preferred_quote: Quote) -> EscapeLayout {
-                    EscapeLayout { quote: choose_quote(single_count, double_count, preferred_quote).0, len: None }
+                fn stop(
+                    single_count: usize,
+                    double_count: usize,
+                    preferred_quote: Quote,
+                ) -> EscapeLayout {
+                    EscapeLayout {
+                        quote: choose_quote(single_count, double_count, preferred_quote).0,
+                        len: None,
+                    }
                 }
                 return stop(single_count, double_count, preferred_quote);
             };

parser/src/string.rs

@@ -374,7 +374,9 @@ impl<'a> StringParser<'a> {
                     expression.push(ch);
                     loop {
                         let Some(c) = self.next_char() else {
-                            return Err(FStringError::new(UnterminatedString, self.get_pos()).into());
+                            return Err(
+                                FStringError::new(UnterminatedString, self.get_pos()).into()
+                            );
                         };
                         expression.push(c);
                         if c == ch {
@@ -408,7 +410,7 @@ impl<'a> StringParser<'a> {
                         spec_constructor.push(
                             self.expr(
                                 ast::ExprConstant {
-                                    value: constant_piece.drain(..).collect::<String>().into(),
+                                    value: std::mem::take(&mut constant_piece).into(),
                                     kind: None,
                                     range: self.range(),
                                 }
@@ -433,7 +435,7 @@ impl<'a> StringParser<'a> {
             spec_constructor.push(
                 self.expr(
                     ast::ExprConstant {
-                        value: constant_piece.drain(..).collect::<String>().into(),
+                        value: std::mem::take(&mut constant_piece).into(),
                         kind: None,
                         range: self.range(),
                     }
@@ -475,7 +477,7 @@ impl<'a> StringParser<'a> {
                         values.push(
                             self.expr(
                                 ast::ExprConstant {
-                                    value: content.drain(..).collect::<String>().into(),
+                                    value: std::mem::take(&mut content).into(),
                                     kind: None,
                                     range: self.range(),
                                 }